Commit 285c8a7a authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: make function op structures const 



No functional changes, these structures should be const.

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

include/linux/netfilter.h

+4 −4
Original line number Diff line number Diff line
@@ -381,13 +381,13 @@ struct nf_nat_hook { 
				  enum ip_conntrack_dir dir);

};



extern struct nf_nat_hook __rcu *nf_nat_hook;

extern const struct nf_nat_hook __rcu *nf_nat_hook;



static inline void

nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family)

{

#if IS_ENABLED(CONFIG_NF_NAT)

	struct nf_nat_hook *nat_hook;

	const struct nf_nat_hook *nat_hook;



	rcu_read_lock();

	nat_hook = rcu_dereference(nf_nat_hook);
@@ -464,7 +464,7 @@ struct nf_ct_hook { 
			      const struct sk_buff *);

	void (*attach)(struct sk_buff *nskb, const struct sk_buff *skb);

};

extern struct nf_ct_hook __rcu *nf_ct_hook;

extern const struct nf_ct_hook __rcu *nf_ct_hook;



struct nlattr;
@@ -479,7 +479,7 @@ struct nfnl_ct_hook { 
	void (*seq_adjust)(struct sk_buff *skb, struct nf_conn *ct,

			   enum ip_conntrack_info ctinfo, s32 off);

};

extern struct nfnl_ct_hook __rcu *nfnl_ct_hook;

extern const struct nfnl_ct_hook __rcu *nfnl_ct_hook;



/**

 * nf_skb_duplicated - TEE target has sent a packet

net/netfilter/core.c

+5 −5
Original line number Diff line number Diff line
@@ -666,14 +666,14 @@ EXPORT_SYMBOL(nf_hook_slow_list); 
/* This needs to be compiled in any case to avoid dependencies between the

 * nfnetlink_queue code and nf_conntrack.

 */

struct nfnl_ct_hook __rcu *nfnl_ct_hook __read_mostly;

const struct nfnl_ct_hook __rcu *nfnl_ct_hook __read_mostly;

EXPORT_SYMBOL_GPL(nfnl_ct_hook);



struct nf_ct_hook __rcu *nf_ct_hook __read_mostly;

const struct nf_ct_hook __rcu *nf_ct_hook __read_mostly;

EXPORT_SYMBOL_GPL(nf_ct_hook);



#if IS_ENABLED(CONFIG_NF_CONNTRACK)

struct nf_nat_hook __rcu *nf_nat_hook __read_mostly;

const struct nf_nat_hook __rcu *nf_nat_hook __read_mostly;

EXPORT_SYMBOL_GPL(nf_nat_hook);



/* This does not belong here, but locally generated errors need it if connection
@@ -696,7 +696,7 @@ EXPORT_SYMBOL(nf_ct_attach); 


void nf_conntrack_destroy(struct nf_conntrack *nfct)

{

	struct nf_ct_hook *ct_hook;

	const struct nf_ct_hook *ct_hook;



	rcu_read_lock();

	ct_hook = rcu_dereference(nf_ct_hook);
@@ -709,7 +709,7 @@ EXPORT_SYMBOL(nf_conntrack_destroy); 
bool nf_ct_get_tuple_skb(struct nf_conntrack_tuple *dst_tuple,

			 const struct sk_buff *skb)

{

	struct nf_ct_hook *ct_hook;

	const struct nf_ct_hook *ct_hook;

	bool ret = false;



	rcu_read_lock();

net/netfilter/nf_conntrack_core.c

+2 −2
Original line number Diff line number Diff line
@@ -2085,9 +2085,9 @@ static int __nf_conntrack_update(struct net *net, struct sk_buff *skb, 
				 struct nf_conn *ct,

				 enum ip_conntrack_info ctinfo)

{

	const struct nf_nat_hook *nat_hook;

	struct nf_conntrack_tuple_hash *h;

	struct nf_conntrack_tuple tuple;

	struct nf_nat_hook *nat_hook;

	unsigned int status;

	int dataoff;

	u16 l3num;
@@ -2769,7 +2769,7 @@ int nf_conntrack_init_start(void) 
	return ret;

}



static struct nf_ct_hook nf_conntrack_hook = {

static const struct nf_ct_hook nf_conntrack_hook = {

	.update		= nf_conntrack_update,

	.destroy	= destroy_conntrack,

	.get_tuple_skb  = nf_conntrack_get_tuple_skb,

net/netfilter/nf_conntrack_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -1819,7 +1819,7 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct, 
			  const struct nlattr *attr)

	__must_hold(RCU)

{

	struct nf_nat_hook *nat_hook;

	const struct nf_nat_hook *nat_hook;

	int err;



	nat_hook = rcu_dereference(nf_nat_hook);
@@ -2921,7 +2921,7 @@ static void ctnetlink_glue_seqadj(struct sk_buff *skb, struct nf_conn *ct, 
	nf_ct_tcp_seqadj_set(skb, ct, ctinfo, diff);

}



static struct nfnl_ct_hook ctnetlink_glue_hook = {

static const struct nfnl_ct_hook ctnetlink_glue_hook = {

	.build_size	= ctnetlink_glue_build_size,

	.build		= ctnetlink_glue_build,

	.parse		= ctnetlink_glue_parse,

net/netfilter/nf_nat_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1167,7 +1167,7 @@ static struct pernet_operations nat_net_ops = { 
	.size = sizeof(struct nat_net),

};



static struct nf_nat_hook nat_hook = {

static const struct nf_nat_hook nat_hook = {

	.parse_nat_setup	= nfnetlink_parse_nat_setup,

#ifdef CONFIG_XFRM

	.decode_session		= __nf_nat_decode_session,