Commit 24d19826 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: make all set structs const 



They do not need to be writeable anymore.

v2: remove left-over __read_mostly annotation in set_pipapo.c (Stefano)

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent e32a4dc6

include/net/netfilter/nf_tables.h

+0 −4
Original line number Diff line number Diff line
@@ -385,14 +385,10 @@ struct nft_set_ops { 
 *      struct nft_set_type - nf_tables set type

 *

 *      @ops: set ops for this type

 *      @list: used internally

 *      @owner: module reference

 *      @features: features supported by the implementation

 */

struct nft_set_type {

	const struct nft_set_ops	ops;

	struct list_head		list;

	struct module			*owner;

	u32				features;

};

#define to_set_type(o) container_of(o, struct nft_set_type, ops)

include/net/netfilter/nf_tables_core.h

+6 −6
Original line number Diff line number Diff line
@@ -69,12 +69,12 @@ extern const struct nft_expr_ops nft_payload_fast_ops; 
extern struct static_key_false nft_counters_enabled;

extern struct static_key_false nft_trace_enabled;



extern struct nft_set_type nft_set_rhash_type;

extern struct nft_set_type nft_set_hash_type;

extern struct nft_set_type nft_set_hash_fast_type;

extern struct nft_set_type nft_set_rbtree_type;

extern struct nft_set_type nft_set_bitmap_type;

extern struct nft_set_type nft_set_pipapo_type;

extern const struct nft_set_type nft_set_rhash_type;

extern const struct nft_set_type nft_set_hash_type;

extern const struct nft_set_type nft_set_hash_fast_type;

extern const struct nft_set_type nft_set_rbtree_type;

extern const struct nft_set_type nft_set_bitmap_type;

extern const struct nft_set_type nft_set_pipapo_type;



struct nft_expr;

struct nft_regs;

net/netfilter/nf_tables_api.c

+2 −12
Original line number Diff line number Diff line
@@ -3344,11 +3344,6 @@ nft_select_set_ops(const struct nft_ctx *ctx, 
			break;

		}



		if (!try_module_get(type->owner))

			continue;

		if (bops != NULL)

			module_put(to_set_type(bops)->owner);



		bops = ops;

		best = est;

	}
@@ -4047,10 +4042,8 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk, 
		size = ops->privsize(nla, &desc);



	set = kvzalloc(sizeof(*set) + size + udlen, GFP_KERNEL);

	if (!set) {

		err = -ENOMEM;

		goto err1;

	}

	if (!set)

		return -ENOMEM;



	name = nla_strdup(nla[NFTA_SET_NAME], GFP_KERNEL);

	if (!name) {
@@ -4109,8 +4102,6 @@ err3: 
	kfree(set->name);

err2:

	kvfree(set);

err1:

	module_put(to_set_type(ops)->owner);

	return err;

}
@@ -4120,7 +4111,6 @@ static void nft_set_destroy(struct nft_set *set) 
		return;



	set->ops->destroy(set);

	module_put(to_set_type(set->ops)->owner);

	kfree(set->name);

	kvfree(set);

}

net/netfilter/nft_set_bitmap.c

+1 −2
Original line number Diff line number Diff line
@@ -293,8 +293,7 @@ static bool nft_bitmap_estimate(const struct nft_set_desc *desc, u32 features, 
	return true;

}



struct nft_set_type nft_set_bitmap_type __read_mostly = {

	.owner		= THIS_MODULE,

const struct nft_set_type nft_set_bitmap_type = {

	.ops		= {

		.privsize	= nft_bitmap_privsize,

		.elemsize	= offsetof(struct nft_bitmap_elem, ext),

net/netfilter/nft_set_hash.c

+3 −6
Original line number Diff line number Diff line
@@ -662,8 +662,7 @@ static bool nft_hash_fast_estimate(const struct nft_set_desc *desc, u32 features 
	return true;

}



struct nft_set_type nft_set_rhash_type __read_mostly = {

	.owner		= THIS_MODULE,

const struct nft_set_type nft_set_rhash_type = {

	.features	= NFT_SET_MAP | NFT_SET_OBJECT |

			  NFT_SET_TIMEOUT | NFT_SET_EVAL,

	.ops		= {
@@ -686,8 +685,7 @@ struct nft_set_type nft_set_rhash_type __read_mostly = { 
	},

};



struct nft_set_type nft_set_hash_type __read_mostly = {

	.owner		= THIS_MODULE,

const struct nft_set_type nft_set_hash_type = {

	.features	= NFT_SET_MAP | NFT_SET_OBJECT,

	.ops		= {

		.privsize       = nft_hash_privsize,
@@ -706,8 +704,7 @@ struct nft_set_type nft_set_hash_type __read_mostly = { 
	},

};



struct nft_set_type nft_set_hash_fast_type __read_mostly = {

	.owner		= THIS_MODULE,

const struct nft_set_type nft_set_hash_fast_type = {

	.features	= NFT_SET_MAP | NFT_SET_OBJECT,

	.ops		= {

		.privsize       = nft_hash_privsize,

CRA Git | Maintained and supported by SUSTech CRA and CCSE