netlink_linearize: use div_round_up in byteorder length
Pablo Neira Ayuso
maintainerPATCH 1/1 netlink_linearize: use div_round_up in byteorder length
Use div_round_up() to calculate the byteorder length, otherwise fields that take % BITS_PER_BYTE != 0 are not considered by the byteorder expression.
Reported-by Florian Westphal <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/netlink_linearize.c | 2 +- tests/py/ip6/ct.t.payload | 10 +++++----- tests/py/ip6/meta.t.payload | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
src/netlink_linearize.c +1 -1
@@ -806,7 +806,7 @@ static void netlink_gen_unary(struct netlink_linearize_ctx *ctx,netlink_put_register (nle,NFTNL_EXPR_BYTEORDER_SREG , dreg);netlink_put_register (nle,NFTNL_EXPR_BYTEORDER_DREG , dreg);nftnl_expr_set_u32 (nle,NFTNL_EXPR_BYTEORDER_LEN , - expr->len /BITS_PER_BYTE ); +div_round_up (expr->len,BITS_PER_BYTE ));nftnl_expr_set_u32 (nle,NFTNL_EXPR_BYTEORDER_SIZE , byte_size); nftnl_expr_set_u32(nle, NFTNL_EXPR_BYTEORDER_OP,
tests/py/ip6/ct.t.payload +5 -5
@@ -3,7 +3,7 @@ ip6 test-ip6 output [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] - [ byteorder reg 1 = ntoh(reg 1, 2, 1) ] + [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 << 0x00000002 ) ] [ bitwise reg 1 = ( reg 1 & 0xffffffef ) ^ 0x00000010 ] [ ct set mark with reg 1 ]
@@ -13,7 +13,7 @@ ip6 test-ip6 output [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] - [ byteorder reg 1 = ntoh(reg 1, 2, 1) ] + [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 << 0x0000001a ) ] [ bitwise reg 1 = ( reg 1 & 0xffffffef ) ^ 0x00000010 ] [ ct set mark with reg 1 ]
@@ -23,7 +23,7 @@ ip6 test-ip6 output [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] - [ byteorder reg 1 = ntoh(reg 1, 2, 1) ] + [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 & 0xfffffffb ) ^ 0x00000004 ] [ ct set mark with reg 1 ]
@@ -32,7 +32,7 @@ ip6 test-ip6 output [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] - [ byteorder reg 1 = ntoh(reg 1, 2, 1) ] + [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 & 0x00ffffff ) ^ 0xff000000 ] [ ct set mark with reg 1 ]
@@ -41,6 +41,6 @@ ip6 test-ip6 output [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] - [ byteorder reg 1 = ntoh(reg 1, 2, 1) ] + [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 & 0x0000003c ) ^ 0x00000000 ] [ ct set mark with reg 1 ]
tests/py/ip6/meta.t.payload +2 -2
@@ -66,7 +66,7 @@ ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] - [ byteorder reg 1 = ntoh(reg 1, 2, 1) ] + [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 << 0x00000002 ) ] [ bitwise reg 1 = ( reg 1 & 0xffffffef ) ^ 0x00000010 ] [ meta set mark with reg 1 ]
@@ -76,7 +76,7 @@ ip6 test-ip6 input [ payload load 2b @ network header + 0 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] - [ byteorder reg 1 = ntoh(reg 1, 2, 1) ] + [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 << 0x0000001a ) ] [ bitwise reg 1 = ( reg 1 & 0xffffffef ) ^ 0x00000010 ] [ meta set mark with reg 1 ]
Signature · 1 line
2.30.2
Florian Westphal
maintainerQuoted 3 lines · Pablo Neira Ayuso
Use
div_round_up()to calculate the byteorder length, otherwise fields that take %BITS_PER_BYTE!= 0 are not considered by the byteorder expression.
Thanks for fixing this! Patch LGTM.