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: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index cba3ccf03fcc842312a78fe9316aaaca49689451..3cbf29dd0b717b74b2ccbba4f128d1c10a9ef161 100644 (file)
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -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 */

diff --git a/net/netfilter/nf_conntrack_amanda.c b/net/netfilter/nf_conntrack_amanda.c
index d011d2eb08486f7e7b5507358f528f0490e0ea90..7be4c35e4795ead2216b4add1bec5b26d71746f5 100644 (file)
--- a/net/netfilter/nf_conntrack_amanda.c
+++ b/net/netfilter/nf_conntrack_amanda.c
@@ -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);

diff --git a/net/netfilter/nf_conntrack_broadcast.c b/net/netfilter/nf_conntrack_broadcast.c
index cfa0fe0356de67e479b30723aefb3192f391cc9f..a7552a46d6acf56239131eea3828ff3250e206b3 100644 (file)
--- a/net/netfilter/nf_conntrack_broadcast.c
+++ b/net/netfilter/nf_conntrack_broadcast.c
@@ -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;
 }

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 456446d7af200e1f786430a10c8c7bcf0639e26d..0149d482adaa6989c8684cf9fe257a0801076140 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -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);
 

diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 5a9bce24f3c3d94e2e433145c6ef0e320554fe58..14f73872f64778660bec2113903a61d0099df077 100644 (file)
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -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;
 }

diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index d0eac27f6ba03cff12350a95ac48b9ed03fb778a..ca748f8dbff130d5dde1406a538242608eb57a2d 100644 (file)
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -1553,7 +1553,7 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff,
        if (dataoff >= skb->len)
                return NF_ACCEPT;
 
-       nf_ct_refresh(ct, skb, sip_timeout * HZ);
+       nf_ct_refresh(ct, sip_timeout * HZ);
 
        if (unlikely(skb_linearize(skb)))
                return NF_DROP;
@@ -1624,7 +1624,7 @@ static int sip_help_udp(struct sk_buff *skb, unsigned int protoff,
        if (dataoff >= skb->len)
                return NF_ACCEPT;
 
-       nf_ct_refresh(ct, skb, sip_timeout * HZ);
+       nf_ct_refresh(ct, sip_timeout * HZ);
 
        if (unlikely(skb_linearize(skb)))
                return NF_DROP;

diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index 67a41cd2baaff0c35898f06cf3c072a6c5bd8356..2e59aba681a138b3e1a03613a16dfeb316fbc98f 100644 (file)
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -929,7 +929,7 @@ static void nft_ct_timeout_obj_eval(struct nft_object *obj,
         */
        values = nf_ct_timeout_data(timeout);
        if (values)
-               nf_ct_refresh(ct, pkt->skb, values[0]);
+               nf_ct_refresh(ct, values[0]);
 }
 
 static int nft_ct_timeout_obj_init(const struct nft_ctx *ctx,