nft: Exit if nftnl_alloc_expr fails
Phil Sutter
reviewerPATCH 1/1 nft: Exit if nftnl_alloc_expr fails
In some code-paths, 'reg' pointer remaining unallocated is used later so at least minimal error checking is necessary. Given that a call to nftnl_alloc_expr() should never fail with sane argument, complain and exit if it happens.
--- iptables/nft-shared.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
iptables/nft-shared.c +17 -15
@@ -40,15 +40,25 @@ extern struct nft_family_ops nft_family_ops_ipv6;extern struct nft_family_ops nft_family_ops_arp;extern struct nft_family_ops nft_family_ops_bridge; +static struct nftnl_expr *nftnl_expr_alloc_or_die (const char *name) +{ +struct nftnl_expr *expr =nftnl_expr_alloc (name); + +if (expr) +return expr; + + +xtables_error (RESOURCE_PROBLEM , +"Failed to allocate nftnl expression '%s'" , name); +} +void add_meta (struct nft_handle *h,struct nftnl_rule *r,uint32_t key,uint8_t *dreg) {struct nftnl_expr *expr;uint8_t reg; - expr =nftnl_expr_alloc ("meta" ); -if (expr ==NULL ) -return ; + expr =nftnl_expr_alloc_or_die ("meta" ); reg =NFT_REG_1 ;nftnl_expr_set_u32 (expr,NFTNL_EXPR_META_KEY , key);
@@ -64,9 +74,7 @@ void add_payload(struct nft_handle *h, struct nftnl_rule *r,struct nftnl_expr *expr;uint8_t reg; - expr =nftnl_expr_alloc ("payload" ); -if (expr ==NULL ) -return ; + expr =nftnl_expr_alloc_or_die ("payload" ); reg =NFT_REG_1 ;nftnl_expr_set_u32 (expr,NFTNL_EXPR_PAYLOAD_BASE , base);
@@ -85,9 +93,7 @@ void add_bitwise_u16(struct nft_handle *h, struct nftnl_rule *r,struct nftnl_expr *expr;uint8_t reg; - expr =nftnl_expr_alloc ("bitwise" ); -if (expr ==NULL ) -return ; + expr =nftnl_expr_alloc_or_die ("bitwise" ); reg =NFT_REG_1 ;nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_SREG , sreg);
@@ -107,9 +113,7 @@ void add_bitwise(struct nft_handle *h, struct nftnl_rule *r,uint32_t xor[4 ] = {0 };uint8_t reg = *dreg; - expr =nftnl_expr_alloc ("bitwise" ); -if (expr ==NULL ) -return ; + expr =nftnl_expr_alloc_or_die ("bitwise" );nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_SREG , sreg);nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_DREG , reg);
@@ -126,9 +130,7 @@ void add_cmp_ptr(struct nftnl_rule *r, uint32_t op, void *data, size_t len, {struct nftnl_expr *expr; - expr =nftnl_expr_alloc ("cmp" ); -if (expr ==NULL ) -return ; + expr =nftnl_expr_alloc_or_die ("cmp" );nftnl_expr_set_u32 (expr,NFTNL_EXPR_CMP_SREG , sreg);nftnl_expr_set_u32 (expr,NFTNL_EXPR_CMP_OP , op);
Signature · 1 line
2.34.1
Pablo Neira Ayuso
maintainerQuoted 16 lines · Phil Sutter
In some code-paths, 'reg' pointer remaining unallocated is used later so at least minimal error checking is necessary. Given that a call to
nftnl_alloc_expr()should never fail with sane argument, complain and exit if it happens.Fixes 7e38890c6b4fb ("nft: prepare for dynamic register allocation")Signed-off-by Phil Sutter <[email protected]>--- iptables/nft-shared.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)iptables/nft-shared.c +0
-0
iptables/nft-shared.c extern struct nft_family_ops nft_family_ops_ipv6; · line 43
Quoted 4 lines
iptables/nft-shared.c +1
-0@@ -40,15 +40,25 @@ extern struct nft_family_ops nft_family_ops_ipv6;extern struct nft_family_ops nft_family_ops_arp;extern struct nft_family_ops nft_family_ops_bridge; +static struct nftnl_expr *nftnl_expr_alloc_or_die (const char *name)
better call this:
xt_nftnl_expr_alloc()
or such, to not enter nftnl_ namespace, I'd suggest.
iptables/nft-shared.c extern struct nft_family_ops nft_family_ops_ipv6; · line 49
Quoted 6 lines
iptables/nft-shared.c +6
-0+{ +struct nftnl_expr *expr =nftnl_expr_alloc (name); + +if (expr) +return expr; +
extra line space.
Quoted 65 lines
iptables/nft-shared.c +10
-15+ +xtables_error (RESOURCE_PROBLEM , +"Failed to allocate nftnl expression '%s'" , name); +} +void add_meta (struct nft_handle *h,struct nftnl_rule *r,uint32_t key,uint8_t *dreg) {struct nftnl_expr *expr;uint8_t reg; - expr =nftnl_expr_alloc ("meta" ); -if (expr ==NULL ) -return ; + expr =nftnl_expr_alloc_or_die ("meta" ); reg =NFT_REG_1 ;nftnl_expr_set_u32 (expr,NFTNL_EXPR_META_KEY , key);@@ -64,9 +74,7 @@ void add_payload(struct nft_handle *h, struct nftnl_rule *r,struct nftnl_expr *expr;uint8_t reg; - expr =nftnl_expr_alloc ("payload" ); -if (expr ==NULL ) -return ; + expr =nftnl_expr_alloc_or_die ("payload" ); reg =NFT_REG_1 ;nftnl_expr_set_u32 (expr,NFTNL_EXPR_PAYLOAD_BASE , base);@@ -85,9 +93,7 @@ void add_bitwise_u16(struct nft_handle *h, struct nftnl_rule *r,struct nftnl_expr *expr;uint8_t reg; - expr =nftnl_expr_alloc ("bitwise" ); -if (expr ==NULL ) -return ; + expr =nftnl_expr_alloc_or_die ("bitwise" ); reg =NFT_REG_1 ;nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_SREG , sreg);@@ -107,9 +113,7 @@ void add_bitwise(struct nft_handle *h, struct nftnl_rule *r,uint32_t xor[4 ] = {0 };uint8_t reg = *dreg; - expr =nftnl_expr_alloc ("bitwise" ); -if (expr ==NULL ) -return ; + expr =nftnl_expr_alloc_or_die ("bitwise" );nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_SREG , sreg);nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_DREG , reg);@@ -126,9 +130,7 @@ void add_cmp_ptr(struct nftnl_rule *r, uint32_t op, void *data, size_t len, {struct nftnl_expr *expr; - expr =nftnl_expr_alloc ("cmp" ); -if (expr ==NULL ) -return ; + expr =nftnl_expr_alloc_or_die ("cmp" );nftnl_expr_set_u32 (expr,NFTNL_EXPR_CMP_SREG , sreg);nftnl_expr_set_u32 (expr,NFTNL_EXPR_CMP_OP , op);Signature · 1 line
2.34.1
Phil Sutter
reviewerQuoted 20 lines · Pablo Neira Ayuso
Quoted 19 lines · Phil Sutter
In some code-paths, 'reg' pointer remaining unallocated is used later so at least minimal error checking is necessary. Given that a call to
nftnl_alloc_expr()should never fail with sane argument, complain and exit if it happens.Fixes 7e38890c6b4fb ("nft: prepare for dynamic register allocation")Signed-off-by Phil Sutter <[email protected]>--- iptables/nft-shared.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)iptables/nft-shared.c +0
-0@@ -40,15 +40,25 @@ extern struct nft_family_ops nft_family_ops_ipv6;extern struct nft_family_ops nft_family_ops_arp;extern struct nft_family_ops nft_family_ops_bridge;
Quoted 7 lines
iptables/nft-shared.c extern struct nft_family_ops nft_family_ops_ipv6; · line 43
Quoted 1 line
iptables/nft-shared.c +1
-0+static struct nftnl_expr *nftnl_expr_alloc_or_die (const char *name)better call this:
xt_nftnl_expr_alloc()or such, to not enter
nftnl_namespace, I'd suggest.
ACK, will do.
Quoted 8 lines
iptables/nft-shared.c extern struct nft_family_ops nft_family_ops_ipv6; · line 49
Quoted 6 lines
iptables/nft-shared.c +6
-0+{ +struct nftnl_expr *expr =nftnl_expr_alloc (name); + +if (expr) +return expr; +extra line space.
Oh, thanks.