dynset: avoid errouneous assert with ipv6 concat data
PATCH 1/1 dynset: avoid errouneous assert with ipv6 concat data
Fix assert bug of map dynset having ipv6 concat data
nft add rule ip6 table-test chain-1 update @map-X { ip6 saddr : 1000::1 . 5001 }
nft: src/netlink_linearize.c:873: netlink_gen_expr: Assertion `dreg < ctx->reg_low' failed. Aborted (core dumped)
The current code allocates upto 4 registers for map dynset data, but ipv6 concat data of a dynset requires more than 4 registers, resulting in the assert in netlink_gen_expr when generating netlink info for the dynset data.
--- src/netlink_linearize.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
netlink_linearize.c +8 -3
@@ -1588,15 +1588,20 @@ static void netlink_gen_map_stmt(struct netlink_linearize_ctx *ctx,struct nftnl_expr *nle;int num_stmts =0 ;struct stmt *this; +int regspace =0 ; +struct expr *expr_data = stmt->map.data; sreg_key =get_register (ctx, stmt->map.key->key);netlink_gen_expr (ctx, stmt->map.key->key, sreg_key); - sreg_data =get_register (ctx, stmt->map.data); -netlink_gen_expr (ctx, stmt->map.data, sreg_data); +/* Adjust ctx->reg_low to the real size of stmt->map.data */ + regspace =netlink_register_space (expr_data->map->len); + sreg_data = ctx->reg_low; + ctx->reg_low += regspace; +netlink_gen_expr (ctx, expr_data, sreg_data); + ctx->reg_low -= regspace;release_register (ctx, stmt->map.key->key); -release_register (ctx, stmt->map.data); nle =alloc_nft_expr ("dynset" );netlink_put_register (nle,NFTNL_EXPR_DYNSET_SREG_KEY , sreg_key);
Signature · 1 line
2.44.0.windows.1
Florian Westphal
maintainerQuoted 9 lines · Son Dinh
Fix assert bug of map dynset having ipv6 concat data
nft add rule ip6 table-test chain-1 update @map-X { ip6 saddr : 1000::1 . 5001 }
nft:src/netlink_linearize.c:873:netlink_gen_expr: Assertion `dreg <ctx->reg_low' failed. Aborted (core dumped)The current code allocates upto 4 registers for map dynset data, but ipv6 concat data of a dynset requires more than 4 registers, resulting in the assert in
netlink_gen_exprwhen generating netlink info for the dynset data.
Could you plese either extend an existing test case or add a new one for this?
netlink_linearize.c static void netlink_gen_map_stmt(struct netlink_linearize_ctx *ctx, · line 1595
Quoted 1 line
netlink_linearize.c +0
-1- sreg_data =get_register (ctx, stmt->map.data);
This line is wrong, this sould be
sreg_data = get_register(ctx, stmt->map.data->key);
Quoted 4 lines · Florian Westphal
Could you plese either extend an existing test case or add a new one for this?
Sure. I'm working on it.
Quoted 5 lines
Quoted 1 line
-
sreg_data=get_register(ctx, stmt->map.data);This line is wrong, this sould be
sreg_data = get_register(ctx, stmt->map.data->key);
You're correct. Fixing the bug with your suggest is much simpler than mine if getting registers of ipv6 concat data directly with "get_register(ctx, stmt->map.data->key);" instead of "get_register(ctx, stmt->map.data)"
PATCH v2 1/1 dynset: avoid errouneous assert with ipv6 concat data
Fix assert bug of map dynset having ipv6 concat data
nft add rule ip6 table-test chain-1 update @map-X { ip6 saddr : 1000::1 . 5001 }
nft: src/netlink_linearize.c:873: netlink_gen_expr: Assertion `dreg < ctx->reg_low' failed. Aborted (core dumped)
The current code allocates upto 4 registers for map dynset data, but ipv6 concat data of a dynset requires more than 4 registers, resulting in the assert in netlink_gen_expr when generating netlink info for the dynset data.
--- src/netlink_linearize.c | 6 +++--- tests/py/ip/sets.t | 2 ++ tests/py/ip/sets.t.payload.inet | 11 +++++++++++ tests/py/ip/sets.t.payload.ip | 8 ++++++++ tests/py/ip/sets.t.payload.netdev | 10 ++++++++++ tests/py/ip6/sets.t | 3 +++ tests/py/ip6/sets.t.payload.inet | 11 +++++++++++ tests/py/ip6/sets.t.payload.ip6 | 8 ++++++++ tests/py/ip6/sets.t.payload.netdev | 10 ++++++++++ tests/py/nft-test.py | 4 ++++ 10 files changed, 70 insertions(+), 3 deletions(-)
netlink_linearize.c +3 -3
@@ -1592,11 +1592,11 @@ static void netlink_gen_map_stmt(struct netlink_linearize_ctx *ctx, sreg_key =get_register (ctx, stmt->map.key->key);netlink_gen_expr (ctx, stmt->map.key->key, sreg_key); - sreg_data =get_register (ctx, stmt->map.data); -netlink_gen_expr (ctx, stmt->map.data, sreg_data); + sreg_data =get_register (ctx, stmt->map.data->key); +netlink_gen_expr (ctx, stmt->map.data->key, sreg_data);release_register (ctx, stmt->map.key->key); -release_register (ctx, stmt->map.data); +release_register (ctx, stmt->map.data->key); nle =alloc_nft_expr ("dynset" );netlink_put_register (nle,NFTNL_EXPR_DYNSET_SREG_KEY , sreg_key);
py/ip/sets.t +2 -0
@@ -66,3 +66,5 @@ ip saddr @set6 drop;ok ip saddr vmap { 1.1.1.1 : drop, * : accept };ok meta mark set ip saddr map { 1.1.1.1 : 0x00000001, * : 0x00000002 };ok +!map2 type ipv4_addr . ipv4_addr . inet_service : ipv4_addr . inet_service;ok +add @map2 { ip saddr . ip daddr . th dport : 10.0.0.1 . 80 };ok
py/ip/sets.t.payload.inet +11 -0
@@ -104,3 +104,14 @@ inet [ payload load 4b @ network header + 12 => reg 1 ] [ lookup reg 1 set __map%d dreg 1 ] [ meta set mark with reg 1 ] + +# add @map2 { ip saddr . ip daddr . th dport : 10.0.0.1 . 80 } +inet test-inet input + [ meta load nfproto => reg 1 ] + [ cmp eq reg 1 0x00000002 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ payload load 4b @ network header + 16 => reg 9 ] + [ payload load 2b @ transport header + 2 => reg 10 ] + [ immediate reg 11 0x0100000a ] + [ immediate reg 2 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 11 ]
py/ip/sets.t.payload.ip +8 -0
@@ -81,3 +81,11 @@ ip test-ip4 input [ meta load mark => reg 10 ] [ dynset add reg_key 1 set map1 sreg_data 10 ] +# add @map2 { ip saddr . ip daddr . th dport : 10.0.0.1 . 80 } +ip test-ip4 input + [ payload load 4b @ network header + 12 => reg 1 ] + [ payload load 4b @ network header + 16 => reg 9 ] + [ payload load 2b @ transport header + 2 => reg 10 ] + [ immediate reg 11 0x0100000a ] + [ immediate reg 2 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 11 ]
py/ip/sets.t.payload.netdev +10 -0
@@ -105,3 +105,13 @@ netdev test-netdev ingress [ meta load mark => reg 10 ] [ dynset add reg_key 1 set map1 sreg_data 10 ] +# add @map2 { ip saddr . ip daddr . th dport : 10.0.0.1 . 80 } +netdev test-netdev ingress + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x00000008 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ payload load 4b @ network header + 16 => reg 9 ] + [ payload load 2b @ transport header + 2 => reg 10 ] + [ immediate reg 11 0x0100000a ] + [ immediate reg 2 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 11 ]
py/ip6/sets.t +3 -0
@@ -46,3 +46,6 @@ add @set5 { ip6 saddr . ip6 daddr };ok add @map1 { ip6 saddr . ip6 daddr : meta mark };ok delete @set5 { ip6 saddr . ip6 daddr };ok + +!map2 type ipv6_addr . ipv6_addr . inet_service : ipv6_addr . inet_service;ok +add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 };ok
py/ip6/sets.t.payload.inet +11 -0
@@ -47,3 +47,14 @@ inet test-inet input [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ dynset delete reg_key 1 set set5 ] + +# add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 } +inet test-inet input + [ meta load nfproto => reg 1 ] + [ cmp eq reg 1 0x0000000a ] + [ payload load 16b @ network header + 8 => reg 1 ] + [ payload load 16b @ network header + 24 => reg 2 ] + [ payload load 2b @ transport header + 2 => reg 3 ] + [ immediate reg 17 0x00003412 0x00000000 0x00000000 0x01000000 ] + [ immediate reg 21 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 17 ]
py/ip6/sets.t.payload.ip6 +8 -0
@@ -36,3 +36,11 @@ ip6 test-ip6 input [ meta load mark => reg 3 ] [ dynset add reg_key 1 set map1 sreg_data 3 ] +# add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 } +ip6 test-ip6 input + [ payload load 16b @ network header + 8 => reg 1 ] + [ payload load 16b @ network header + 24 => reg 2 ] + [ payload load 2b @ transport header + 2 => reg 3 ] + [ immediate reg 17 0x00003412 0x00000000 0x00000000 0x01000000 ] + [ immediate reg 21 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 17 ]
py/ip6/sets.t.payload.netdev +10 -0
@@ -48,3 +48,13 @@ netdev test-netdev ingress [ meta load mark => reg 3 ] [ dynset add reg_key 1 set map1 sreg_data 3 ] +# add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 } +netdev test-netdev ingress + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x0000dd86 ] + [ payload load 16b @ network header + 8 => reg 1 ] + [ payload load 16b @ network header + 24 => reg 2 ] + [ payload load 2b @ transport header + 2 => reg 3 ] + [ immediate reg 17 0x00003412 0x00000000 0x00000000 0x01000000 ] + [ immediate reg 21 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 17 ]
py/nft-test.py +4 -0
@@ -1162,6 +1162,10 @@ def set_process(set_line, filename, lineno): set_data = tokens[i+1] i += 2 + while len(tokens) > i and tokens[i] == ".": + set_data += " . " + tokens[i+1] + i += 2 + if parse_typeof and tokens[i] == "mark": set_data += " " + tokens[i] i += 1;
Signature · 1 line
2.44.0.windows.1
PATCH v3 1/1 dynset: avoid errouneous assert with ipv6 concat data
In reply to Son Tra DinhFix assert bug of map dynset having ipv6 concat data
nft add rule ip6 table-test chain-1 update @map-X { ip6 saddr : 1000::1 . 5001 }
nft: src/netlink_linearize.c:873: netlink_gen_expr: Assertion `dreg < ctx->reg_low' failed. Aborted (core dumped)
The current code allocates upto 4 registers for map dynset data, but ipv6 concat data of a dynset requires more than 4 registers, resulting in the assert in netlink_gen_expr when generating netlink info for the dynset data.
--- src/netlink_linearize.c | 6 ++--- tests/py/ip/sets.t | 2 ++ tests/py/ip/sets.t.json | 37 ++++++++++++++++++++++++++++++ tests/py/ip/sets.t.payload.inet | 11 +++++++++ tests/py/ip/sets.t.payload.ip | 8 +++++++ tests/py/ip/sets.t.payload.netdev | 10 ++++++++ tests/py/ip6/sets.t | 3 +++ tests/py/ip6/sets.t.json | 37 ++++++++++++++++++++++++++++++ tests/py/ip6/sets.t.payload.inet | 11 +++++++++ tests/py/ip6/sets.t.payload.ip6 | 8 +++++++ tests/py/ip6/sets.t.payload.netdev | 10 ++++++++ tests/py/nft-test.py | 4 ++++ 12 files changed, 144 insertions(+), 3 deletions(-)
netlink_linearize.c +3 -3
@@ -1592,11 +1592,11 @@ static void netlink_gen_map_stmt(struct netlink_linearize_ctx *ctx, sreg_key =get_register (ctx, stmt->map.key->key);netlink_gen_expr (ctx, stmt->map.key->key, sreg_key); - sreg_data =get_register (ctx, stmt->map.data); -netlink_gen_expr (ctx, stmt->map.data, sreg_data); + sreg_data =get_register (ctx, stmt->map.data->key); +netlink_gen_expr (ctx, stmt->map.data->key, sreg_data);release_register (ctx, stmt->map.key->key); -release_register (ctx, stmt->map.data); +release_register (ctx, stmt->map.data->key); nle =alloc_nft_expr ("dynset" );netlink_put_register (nle,NFTNL_EXPR_DYNSET_SREG_KEY , sreg_key);
py/ip/sets.t +2 -0
@@ -66,3 +66,5 @@ ip saddr @set6 drop;ok ip saddr vmap { 1.1.1.1 : drop, * : accept };ok meta mark set ip saddr map { 1.1.1.1 : 0x00000001, * : 0x00000002 };ok +!map2 type ipv4_addr . ipv4_addr . inet_service : ipv4_addr . inet_service;ok +add @map2 { ip saddr . ip daddr . th dport : 10.0.0.1 . 80 };ok
py/ip/sets.t.json +37 -0
@@ -303,3 +303,40 @@ } ] +# add @map2 { ip saddr . ip daddr . th dport : 10.0.0.1 . 80 } +[ + { + "map": { + "data": { + "concat": [ + "10.0.0.1", + 80 + ] + }, + "elem": { + "concat": [ + { + "payload": { + "field": "saddr", + "protocol": "ip" + } + }, + { + "payload": { + "field": "daddr", + "protocol": "ip" + } + }, + { + "payload": { + "field": "dport", + "protocol": "th" + } + } + ] + }, + "map": "@map2", + "op": "add" + } + } +]
py/ip/sets.t.payload.inet +11 -0
@@ -104,3 +104,14 @@ inet [ payload load 4b @ network header + 12 => reg 1 ] [ lookup reg 1 set __map%d dreg 1 ] [ meta set mark with reg 1 ] + +# add @map2 { ip saddr . ip daddr . th dport : 10.0.0.1 . 80 } +inet test-inet input + [ meta load nfproto => reg 1 ] + [ cmp eq reg 1 0x00000002 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ payload load 4b @ network header + 16 => reg 9 ] + [ payload load 2b @ transport header + 2 => reg 10 ] + [ immediate reg 11 0x0100000a ] + [ immediate reg 2 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 11 ]
py/ip/sets.t.payload.ip +8 -0
@@ -81,3 +81,11 @@ ip test-ip4 input [ meta load mark => reg 10 ] [ dynset add reg_key 1 set map1 sreg_data 10 ] +# add @map2 { ip saddr . ip daddr . th dport : 10.0.0.1 . 80 } +ip test-ip4 input + [ payload load 4b @ network header + 12 => reg 1 ] + [ payload load 4b @ network header + 16 => reg 9 ] + [ payload load 2b @ transport header + 2 => reg 10 ] + [ immediate reg 11 0x0100000a ] + [ immediate reg 2 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 11 ]
py/ip/sets.t.payload.netdev +10 -0
@@ -105,3 +105,13 @@ netdev test-netdev ingress [ meta load mark => reg 10 ] [ dynset add reg_key 1 set map1 sreg_data 10 ] +# add @map2 { ip saddr . ip daddr . th dport : 10.0.0.1 . 80 } +netdev test-netdev ingress + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x00000008 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ payload load 4b @ network header + 16 => reg 9 ] + [ payload load 2b @ transport header + 2 => reg 10 ] + [ immediate reg 11 0x0100000a ] + [ immediate reg 2 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 11 ]
py/ip6/sets.t +3 -0
@@ -46,3 +46,6 @@ add @set5 { ip6 saddr . ip6 daddr };ok add @map1 { ip6 saddr . ip6 daddr : meta mark };ok delete @set5 { ip6 saddr . ip6 daddr };ok + +!map2 type ipv6_addr . ipv6_addr . inet_service : ipv6_addr . inet_service;ok +add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 };ok
py/ip6/sets.t.json +37 -0
@@ -148,3 +148,40 @@ } ] +# add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 } +[ + { + "map": { + "data": { + "concat": [ + "1234::1", + 80 + ] + }, + "elem": { + "concat": [ + { + "payload": { + "field": "saddr", + "protocol": "ip6" + } + }, + { + "payload": { + "field": "daddr", + "protocol": "ip6" + } + }, + { + "payload": { + "field": "dport", + "protocol": "th" + } + } + ] + }, + "map": "@map2", + "op": "add" + } + } +]
py/ip6/sets.t.payload.inet +11 -0
@@ -47,3 +47,14 @@ inet test-inet input [ payload load 16b @ network header + 8 => reg 1 ] [ payload load 16b @ network header + 24 => reg 2 ] [ dynset delete reg_key 1 set set5 ] + +# add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 } +inet test-inet input + [ meta load nfproto => reg 1 ] + [ cmp eq reg 1 0x0000000a ] + [ payload load 16b @ network header + 8 => reg 1 ] + [ payload load 16b @ network header + 24 => reg 2 ] + [ payload load 2b @ transport header + 2 => reg 3 ] + [ immediate reg 17 0x00003412 0x00000000 0x00000000 0x01000000 ] + [ immediate reg 21 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 17 ]
py/ip6/sets.t.payload.ip6 +8 -0
@@ -36,3 +36,11 @@ ip6 test-ip6 input [ meta load mark => reg 3 ] [ dynset add reg_key 1 set map1 sreg_data 3 ] +# add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 } +ip6 test-ip6 input + [ payload load 16b @ network header + 8 => reg 1 ] + [ payload load 16b @ network header + 24 => reg 2 ] + [ payload load 2b @ transport header + 2 => reg 3 ] + [ immediate reg 17 0x00003412 0x00000000 0x00000000 0x01000000 ] + [ immediate reg 21 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 17 ]
py/ip6/sets.t.payload.netdev +10 -0
@@ -48,3 +48,13 @@ netdev test-netdev ingress [ meta load mark => reg 3 ] [ dynset add reg_key 1 set map1 sreg_data 3 ] +# add @map2 { ip6 saddr . ip6 daddr . th dport : 1234::1 . 80 } +netdev test-netdev ingress + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x0000dd86 ] + [ payload load 16b @ network header + 8 => reg 1 ] + [ payload load 16b @ network header + 24 => reg 2 ] + [ payload load 2b @ transport header + 2 => reg 3 ] + [ immediate reg 17 0x00003412 0x00000000 0x00000000 0x01000000 ] + [ immediate reg 21 0x00005000 ] + [ dynset add reg_key 1 set map2 sreg_data 17 ]
py/nft-test.py +4 -0
@@ -1162,6 +1162,10 @@ def set_process(set_line, filename, lineno): set_data = tokens[i+1] i += 2 + while len(tokens) > i and tokens[i] == ".": + set_data += " . " + tokens[i+1] + i += 2 + if parse_typeof and tokens[i] == "mark": set_data += " " + tokens[i] i += 1;
Signature · 1 line
2.44.0.windows.1