Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25336cd9 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nftables: add nft_parse_register_load() and use it 



[ 4f16d25c68ec844299a4df6ecbb0234eaf88a935 ]

This new function combines the netlink register attribute parser
and the load validation function.

This update requires to replace:

	enum nft_registers      sreg:8;

in many of the expression private areas otherwise compiler complains
with:

	error: cannot take address of bit-field ‘sreg’

when passing the register field as reference.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 116d53f0

include/net/netfilter/nf_tables.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest); 
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_validate_register_load(enum nft_registers reg, unsigned int len);

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

int nft_validate_register_store(const struct nft_ctx *ctx,

				enum nft_registers reg,

				const struct nft_data *data,

include/net/netfilter/nf_tables_core.h

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ void nf_tables_core_module_exit(void); 


struct nft_cmp_fast_expr {

	u32			data;

	enum nft_registers	sreg:8;

	u8			sreg;

	u8			len;

};
@@ -58,7 +58,7 @@ struct nft_payload_set { 
	enum nft_payload_bases	base:8;

	u8			offset;

	u8			len;

	enum nft_registers	sreg:8;

	u8			sreg;

	u8			csum_type;

	u8			csum_offset;

	u8			csum_flags;

include/net/netfilter/nft_meta.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ struct nft_meta { 
	enum nft_meta_keys	key:8;

	union {

		enum nft_registers	dreg:8;

		enum nft_registers	sreg:8;

		u8		sreg;

	};

};

net/ipv4/netfilter/nft_dup_ipv4.c

+9 −9
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include <net/netfilter/ipv4/nf_dup_ipv4.h>



struct nft_dup_ipv4 {

	enum nft_registers	sreg_addr:8;

	enum nft_registers	sreg_dev:8;

	u8	sreg_addr;

	u8	sreg_dev;

};



static void nft_dup_ipv4_eval(const struct nft_expr *expr,
@@ -40,16 +40,16 @@ static int nft_dup_ipv4_init(const struct nft_ctx *ctx, 
	if (tb[NFTA_DUP_SREG_ADDR] == NULL)

		return -EINVAL;



	priv->sreg_addr = nft_parse_register(tb[NFTA_DUP_SREG_ADDR]);

	err = nft_validate_register_load(priv->sreg_addr, sizeof(struct in_addr));

	err = nft_parse_register_load(tb[NFTA_DUP_SREG_ADDR], &priv->sreg_addr,

				      sizeof(struct in_addr));

	if (err < 0)

		return err;



	if (tb[NFTA_DUP_SREG_DEV] != NULL) {

		priv->sreg_dev = nft_parse_register(tb[NFTA_DUP_SREG_DEV]);

		return nft_validate_register_load(priv->sreg_dev, sizeof(int));

	}

	return 0;

	if (tb[NFTA_DUP_SREG_DEV])

		err = nft_parse_register_load(tb[NFTA_DUP_SREG_DEV],

					      &priv->sreg_dev, sizeof(int));



	return err;

}



static int nft_dup_ipv4_dump(struct sk_buff *skb, const struct nft_expr *expr)

net/ipv6/netfilter/nft_dup_ipv6.c

+9 −9
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include <net/netfilter/ipv6/nf_dup_ipv6.h>



struct nft_dup_ipv6 {

	enum nft_registers	sreg_addr:8;

	enum nft_registers	sreg_dev:8;

	u8	sreg_addr;

	u8	sreg_dev;

};



static void nft_dup_ipv6_eval(const struct nft_expr *expr,
@@ -38,16 +38,16 @@ static int nft_dup_ipv6_init(const struct nft_ctx *ctx, 
	if (tb[NFTA_DUP_SREG_ADDR] == NULL)

		return -EINVAL;



	priv->sreg_addr = nft_parse_register(tb[NFTA_DUP_SREG_ADDR]);

	err = nft_validate_register_load(priv->sreg_addr, sizeof(struct in6_addr));

	err = nft_parse_register_load(tb[NFTA_DUP_SREG_ADDR], &priv->sreg_addr,

				      sizeof(struct in6_addr));

	if (err < 0)

		return err;



	if (tb[NFTA_DUP_SREG_DEV] != NULL) {

		priv->sreg_dev = nft_parse_register(tb[NFTA_DUP_SREG_DEV]);

		return nft_validate_register_load(priv->sreg_dev, sizeof(int));

	}

	return 0;

	if (tb[NFTA_DUP_SREG_DEV])

		err = nft_parse_register_load(tb[NFTA_DUP_SREG_DEV],

					      &priv->sreg_dev, sizeof(int));



	return err;

}



static int nft_dup_ipv6_dump(struct sk_buff *skb, const struct nft_expr *expr)