netlink_delinearize: skip flags / mask notation for singleton bitmask again
Pablo Neira Ayuso
maintainerPATCH 1/1 netlink_delinearize: skip flags / mask notation for singleton bitmask again
!= operation should also be covered too.
Fixes 347a4aa16e64 ("netlink_delinearize: skip flags / mask notation for singleton bitmask")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/netlink_delinearize.c | 2 +- tests/py/inet/tcp.t | 1 + tests/py/inet/tcp.t.json | 21 +++++++++++++++++++++ tests/py/inet/tcp.t.payload | 8 ++++++++ 4 files changed, 31 insertions(+), 1 deletion(-)
src/netlink_delinearize.c +1 -1
@@ -2287,10 +2287,10 @@ static void relational_binop_postprocess(struct rule_pp_ctx *ctx,expr_free (binop); }else if (binop->right->etype ==EXPR_VALUE && value->etype ==EXPR_VALUE && - expr->op ==OP_EQ && !mpz_cmp (value->value, binop->right->value)) {/* Skip flag / flag representation for: * data & flag == flag +* data & flag != flag */ ; }else {
tests/py/inet/tcp.t +1 -0
@@ -75,6 +75,7 @@ tcp flags & (syn | ack) != 0;ok;tcp flags syn,ack tcp flags & (syn | ack) == 0;ok;tcp flags ! syn,ack # it should be possible to transform this to: tcp flags syn tcp flags & syn == syn;ok +tcp flags & syn != syn;ok tcp flags & (fin | syn | rst | ack) syn;ok;tcp flags syn / fin,syn,rst,ack tcp flags & (fin | syn | rst | ack) == syn;ok;tcp flags syn / fin,syn,rst,ack tcp flags & (fin | syn | rst | ack) != syn;ok;tcp flags != syn / fin,syn,rst,ack
tests/py/inet/tcp.t.json +21 -0
@@ -1612,6 +1612,27 @@ } ] +# tcp flags & syn != syn +[ + { + "match": { + "left": { + "&": [ + { + "payload": { + "field": "flags", + "protocol": "tcp" + } + }, + "syn" + ] + }, + "op": "!=", + "right": "syn" + } + } +] + # tcp flags & (fin | syn | rst | ack) syn [ {
tests/py/inet/tcp.t.payload +8 -0
@@ -410,6 +410,14 @@ inet test-inet input [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000002 ] +# tcp flags & syn != syn +inet test-inet input + [ meta load l4proto => reg 1 ] + [ cmp eq reg 1 0x00000006 ] + [ payload load 1b @ transport header + 13 => reg 1 ] + [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ] + [ cmp neq reg 1 0x00000002 ] + # tcp flags & (fin | syn | rst | ack) syn inet test-inet input [ meta load l4proto => reg 1 ]
Signature · 1 line
2.20.1