diff options
| author | Florian Westphal <fw@strlen.de> | 2022-07-25 14:32:13 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2022-08-05 01:46:39 +0200 |
| commit | 0d9daa0407212c8cc89b3ea8aee031ddf0109b08 (patch) | |
| tree | 9c8b5a4c2127e7aae2ccf9dd3e73744d922bc500 /include | |
| parent | 89688c947efc36d25c58c85650414fa3a491732e (diff) | |
proto: track full stack of seen l2 protocols, not just cumulative offset
For input, a cumulative size counter of all pushed l2 headers is enough,
because we have the full expression tree available to us.
For delinearization we need to track all seen l2 headers, else we lose
information that we might need at a later time.
Consider:
rule netdev nt nc set update ether saddr . vlan id
during delinearization, the vlan proto_desc replaces the ethernet one,
and by the time we try to split the concatenation apart we will search
the ether saddr offset vs. the templates for proto_vlan.
This replaces the offset with an array that stores the protocol
descriptions seen.
Then, if the payload offset is larger than our description, search the
l2 stack and adjust the offset until we're within the expected offset
boundary.
Reported-by: Eric Garver <eric@garver.life>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/proto.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/proto.h b/include/proto.h index a04240a5..35e760c7 100644 --- a/include/proto.h +++ b/include/proto.h @@ -193,13 +193,14 @@ struct proto_ctx { struct { struct location location; const struct proto_desc *desc; - unsigned int offset; struct { struct location location; const struct proto_desc *desc; } protos[PROTO_CTX_NUM_PROTOS]; unsigned int num_protos; } protocol[PROTO_BASE_MAX + 1]; + const struct proto_desc *stacked_ll[PROTO_CTX_NUM_PROTOS]; + uint8_t stacked_ll_count; }; extern void proto_ctx_init(struct proto_ctx *ctx, unsigned int family, |