Commit 3d77554d authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Jialin Zhang
Browse files

netfilter: nf_tables: validate registers coming from userspace. 

mainline inclusion
from mainline-v5.18-rc1
commit 6e1acfa3
category: bugfix
bugzilla: 186582, https://gitee.com/src-openeuler/kernel/issues/I50WB5
CVE: CVE-2022-1015

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6e1acfa387b9ff82cfc7db8cc3b6959221a95851



--------------------------------

Bail out in case userspace uses unsupported registers.

Fixes: 49499c3e ("netfilter: nf_tables: switch registers to 32 bit addressing")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>

conflict:
	net/netfilter/nf_tables_api.c

Signed-off-by: default avatarLu Wei <luwei32@huawei.com>
Reviewed-by: default avatarLiu Jian <liujian56@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent db9c2907

include/net/netfilter/nf_tables.h

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static inline enum nft_registers nft_type_to_reg(enum nft_data_types type) 
}



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, u32 *preg);

int nft_dump_register(struct sk_buff *skb, unsigned int attr, unsigned int reg);



int nft_parse_register_load(const struct nlattr *attr, u8 *sreg, u32 len);

net/netfilter/nf_tables_api.c

+17 −5
Original line number Diff line number Diff line
@@ -8481,17 +8481,23 @@ EXPORT_SYMBOL_GPL(nft_parse_u32_check); 
 *	Registers used to be 128 bit wide, these register numbers will be

 *	mapped to the corresponding 32 bit register numbers.

 */

unsigned int nft_parse_register(const struct nlattr *attr)

unsigned int nft_parse_register(const struct nlattr *attr, u32 *preg)

{

	unsigned int reg;



	reg = ntohl(nla_get_be32(attr));

	switch (reg) {

	case NFT_REG_VERDICT...NFT_REG_4:

		return reg * NFT_REG_SIZE / NFT_REG32_SIZE;

		*preg = reg * NFT_REG_SIZE / NFT_REG32_SIZE;

		break;

	case NFT_REG32_00...NFT_REG32_15:

		*preg = reg + NFT_REG_SIZE / NFT_REG32_SIZE - NFT_REG32_00;

		break;

	default:

		return reg + NFT_REG_SIZE / NFT_REG32_SIZE - NFT_REG32_00;

		return -ERANGE;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(nft_parse_register);
@@ -8543,7 +8549,10 @@ int nft_parse_register_load(const struct nlattr *attr, u8 *sreg, u32 len) 
	u32 reg;

	int err;



	reg = nft_parse_register(attr);

	err = nft_parse_register(attr, &reg);

	if (err < 0)

		return err;



	err = nft_validate_register_load(reg, len);

	if (err < 0)

		return err;
@@ -8612,7 +8621,10 @@ int nft_parse_register_store(const struct nft_ctx *ctx, 
	int err;

	u32 reg;



	reg = nft_parse_register(attr);

	err = nft_parse_register(attr, &reg);

	if (err < 0)

		return err;



	err = nft_validate_register_store(ctx, reg, data, type, len);

	if (err < 0)

		return err;