payload: don't update protocol context if we can't find a description
Florian Westphal
maintainerPATCH 1/1 payload: don't update protocol context if we can't find a description
Since commit20b1131c07acd2fc ("payload: fix stacked headers protocol context tracking") we deref null pointer if we can't find a description for the desired protocol, so "ip protocol 254" crashes while testing protocols 6 or 17 (tcp, udp) works.
Also add a test case for this.
Signed-off-by Florian Westphal <[email protected]>
--- src/payload.c | 3 +++ tests/py/ip/ip.t | 3 +++ tests/py/ip/ip.t.payload | 5 +++++ tests/py/ip/ip.t.payload.inet | 7 +++++++ tests/py/ip/ip.t.payload.netdev | 7 +++++++ 5 files changed, 25 insertions(+)
src/payload.c +3 -0
@@ -85,6 +85,9 @@ static void payload_expr_pctx_update(struct proto_ctx *ctx, base = ctx->protocol[left->payload.base].desc; desc =proto_find_upper (base, proto); +if (!desc) +return ; +assert (desc->base <=PROTO_BASE_MAX );if (desc->base == base->base) {assert (base->length >0 );
tests/py/ip/ip.t +3 -0
@@ -75,6 +75,9 @@ ip protocol != tcp;ok;ip protocol != 6 ip protocol { icmp, esp, ah, comp, udp, udplite, tcp, dccp, sctp} accept;ok;ip protocol { 33, 136, 17, 51, 50, 6, 132, 1, 108} accept - ip protocol != { icmp, esp, ah, comp, udp, udplite, tcp, dccp, sctp} accept;ok +ip protocol 255;ok +ip protocol 256;fail + ip checksum 13172 drop;ok ip checksum 22;ok ip checksum != 233;ok
tests/py/ip/ip.t.payload +5 -0
@@ -204,6 +204,11 @@ ip test-ip4 input [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] +# ip protocol 255 +ip test-ip4 input + [ payload load 1b @ network header + 9 => reg 1 ] + [ cmp eq reg 1 0x000000ff ] + # ip checksum 13172 drop ip test-ip4 input [ payload load 2b @ network header + 10 => reg 1 ]
tests/py/ip/ip.t.payload.inet +7 -0
@@ -268,6 +268,13 @@ inet test-inet input [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] +# ip protocol 255 +ip test-ip4 input + [ meta load nfproto => reg 1 ] + [ cmp eq reg 1 0x00000002 ] + [ payload load 1b @ network header + 9 => reg 1 ] + [ cmp eq reg 1 0x000000ff ] + # ip checksum 13172 drop inet test-inet input [ meta load nfproto => reg 1 ]
tests/py/ip/ip.t.payload.netdev +7 -0
@@ -204,6 +204,13 @@ netdev test-netdev ingress [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] +# ip protocol 255 +ip test-ip4 input + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x00000008 ] + [ payload load 1b @ network header + 9 => reg 1 ] + [ cmp eq reg 1 0x000000ff ] + # ip checksum 13172 drop netdev test-netdev ingress [ meta load protocol => reg 1 ]
Signature · 1 line
2.7.3
Quoted 10 lines · Florian Westphal
Since commit
20b1131c07acd2fc("payload: fix stacked headers protocol context tracking") we deref null pointer if we can't find a description for the desired protocol, so "ip protocol 254" crashes while testing protocols 6 or 17 (tcp, udp) works.Also add a test case for this.
Thanks for fixing this!