Commit f1d505bb authored by John W. Linville's avatar John W. Linville Committed by Pablo Neira Ayuso

netfilter: nf_tables: fix type mismatch with error return from nft_parse_u32_check

Commit 36b701fa ("netfilter: nf_tables: validate maximum value of
u32 netlink attributes") introduced nft_parse_u32_check with a return
value of "unsigned int", yet on error it returns "-ERANGE".

This patch corrects the mismatch by changing the return value to "int",
which happens to match the actual users of nft_parse_u32_check already.

Found by Coverity, CID 1373930.

Note that commit 21a9e0f1 ("netfilter: nft_exthdr: fix error
handling in nft_exthdr_init()) attempted to address the issue, but
did not address the return type of nft_parse_u32_check.
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Cc: Laura Garcia Liebana <nevola@gmail.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 36b701fa ("netfilter: nf_tables: validate maximum value...")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 444f9017
...@@ -145,7 +145,7 @@ static inline enum nft_registers nft_type_to_reg(enum nft_data_types type) ...@@ -145,7 +145,7 @@ static inline enum nft_registers nft_type_to_reg(enum nft_data_types type)
return type == NFT_DATA_VERDICT ? NFT_REG_VERDICT : NFT_REG_1 * NFT_REG_SIZE / NFT_REG32_SIZE; return type == NFT_DATA_VERDICT ? NFT_REG_VERDICT : NFT_REG_1 * NFT_REG_SIZE / NFT_REG32_SIZE;
} }
unsigned int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest); int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest);
unsigned int nft_parse_register(const struct nlattr *attr); unsigned int nft_parse_register(const struct nlattr *attr);
int nft_dump_register(struct sk_buff *skb, unsigned int attr, unsigned int reg); int nft_dump_register(struct sk_buff *skb, unsigned int attr, unsigned int reg);
......
...@@ -4422,7 +4422,7 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx, ...@@ -4422,7 +4422,7 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,
* Otherwise a 0 is returned and the attribute value is stored in the * Otherwise a 0 is returned and the attribute value is stored in the
* destination variable. * destination variable.
*/ */
unsigned int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest) int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest)
{ {
u32 val; u32 val;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment