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

Commit 312a0c16 authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_conntrack: constify sk_buff argument to nf_ct_attach() 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 6704af53

include/linux/netfilter.h

+2 −2
Original line number Diff line number Diff line
@@ -314,8 +314,8 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family) 
#endif /*CONFIG_NETFILTER*/



#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

extern void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *) __rcu;

extern void nf_ct_attach(struct sk_buff *, struct sk_buff *);

extern void (*ip_ct_attach)(struct sk_buff *, const struct sk_buff *) __rcu;

extern void nf_ct_attach(struct sk_buff *, const struct sk_buff *);

extern void (*nf_ct_destroy)(struct nf_conntrack *) __rcu;



struct nf_conn;

net/netfilter/core.c

+4 −3
Original line number Diff line number Diff line
@@ -234,12 +234,13 @@ EXPORT_SYMBOL(skb_make_writable); 
/* This does not belong here, but locally generated errors need it if connection

   tracking in use: without this, connection may not be in hash table, and hence

   manufactured ICMP or RST packets will not be associated with it. */

void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *) __rcu __read_mostly;

void (*ip_ct_attach)(struct sk_buff *, const struct sk_buff *)

		__rcu __read_mostly;

EXPORT_SYMBOL(ip_ct_attach);



void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb)

void nf_ct_attach(struct sk_buff *new, const struct sk_buff *skb)

{

	void (*attach)(struct sk_buff *, struct sk_buff *);

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



	if (skb->nfct) {

		rcu_read_lock();

net/netfilter/nf_conntrack_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ EXPORT_SYMBOL_GPL(nf_ct_port_nlattr_tuple_size); 
#endif



/* Used by ipt_REJECT and ip6t_REJECT. */

static void nf_conntrack_attach(struct sk_buff *nskb, struct sk_buff *skb)

static void nf_conntrack_attach(struct sk_buff *nskb, const struct sk_buff *skb)

{

	struct nf_conn *ct;

	enum ip_conntrack_info ctinfo;