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

netfilter: conntrack: remove skb argument from nf_ct_refresh 



Its not used (and could be NULL), so remove it.
This allows to use nf_ct_refresh in places where we don't have
an skb without having to double-check that skb == NULL would be safe.

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

include/net/netfilter/nf_conntrack.h

+3 −5
Original line number Diff line number Diff line
@@ -204,8 +204,7 @@ bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff, 
		       struct nf_conntrack_tuple *tuple);



void __nf_ct_refresh_acct(struct nf_conn *ct, enum ip_conntrack_info ctinfo,

			  const struct sk_buff *skb,

			  u32 extra_jiffies, bool do_acct);

			  u32 extra_jiffies, unsigned int bytes);



/* Refresh conntrack for this many jiffies and do accounting */

static inline void nf_ct_refresh_acct(struct nf_conn *ct,
@@ -213,15 +212,14 @@ static inline void nf_ct_refresh_acct(struct nf_conn *ct, 
				      const struct sk_buff *skb,

				      u32 extra_jiffies)

{

	__nf_ct_refresh_acct(ct, ctinfo, skb, extra_jiffies, true);

	__nf_ct_refresh_acct(ct, ctinfo, extra_jiffies, skb->len);

}



/* Refresh conntrack for this many jiffies */

static inline void nf_ct_refresh(struct nf_conn *ct,

				 const struct sk_buff *skb,

				 u32 extra_jiffies)

{

	__nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, false);

	__nf_ct_refresh_acct(ct, 0, extra_jiffies, 0);

}



/* kill conntrack and do accounting */

net/netfilter/nf_conntrack_amanda.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static int amanda_help(struct sk_buff *skb, 


	/* increase the UDP timeout of the master connection as replies from

	 * Amanda clients to the server can be quite delayed */

	nf_ct_refresh(ct, skb, master_timeout * HZ);

	nf_ct_refresh(ct, master_timeout * HZ);



	/* No data? */

	dataoff = protoff + sizeof(struct udphdr);

net/netfilter/nf_conntrack_broadcast.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int nf_conntrack_broadcast_help(struct sk_buff *skb, 
	nf_ct_expect_related(exp, 0);

	nf_ct_expect_put(exp);



	nf_ct_refresh(ct, skb, timeout * HZ);

	nf_ct_refresh(ct, timeout * HZ);

out:

	return NF_ACCEPT;

}

net/netfilter/nf_conntrack_core.c

+3 −4
Original line number Diff line number Diff line
@@ -2089,9 +2089,8 @@ EXPORT_SYMBOL_GPL(nf_conntrack_in); 
/* Refresh conntrack for this many jiffies and do accounting if do_acct is 1 */

void __nf_ct_refresh_acct(struct nf_conn *ct,

			  enum ip_conntrack_info ctinfo,

			  const struct sk_buff *skb,

			  u32 extra_jiffies,

			  bool do_acct)

			  unsigned int bytes)

{

	/* Only update if this is not a fixed timeout */

	if (test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status))
@@ -2104,8 +2103,8 @@ void __nf_ct_refresh_acct(struct nf_conn *ct, 
	if (READ_ONCE(ct->timeout) != extra_jiffies)

		WRITE_ONCE(ct->timeout, extra_jiffies);

acct:

	if (do_acct)

		nf_ct_acct_update(ct, CTINFO2DIR(ctinfo), skb->len);

	if (bytes)

		nf_ct_acct_update(ct, CTINFO2DIR(ctinfo), bytes);

}

EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct);

net/netfilter/nf_conntrack_h323_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1385,7 +1385,7 @@ static int process_rcf(struct sk_buff *skb, struct nf_conn *ct, 
	if (info->timeout > 0) {

		pr_debug("nf_ct_ras: set RAS connection timeout to "

			 "%u seconds\n", info->timeout);

		nf_ct_refresh(ct, skb, info->timeout * HZ);

		nf_ct_refresh(ct, info->timeout * HZ);



		/* Set expect timeout */

		spin_lock_bh(&nf_conntrack_expect_lock);
@@ -1433,7 +1433,7 @@ static int process_urq(struct sk_buff *skb, struct nf_conn *ct, 
	info->sig_port[!dir] = 0;



	/* Give it 30 seconds for UCF or URJ */

	nf_ct_refresh(ct, skb, 30 * HZ);

	nf_ct_refresh(ct, 30 * HZ);



	return 0;

}