lkml.org 
[lkml]   [2015]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] net-ipv6: Delete unnecessary checks before the function call "kfree_skb"
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sat, 14 Nov 2015 19:55:00 +0100

    The kfree_skb() function tests whether its argument is NULL and then
    returns immediately. Thus the test around the calls is not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    net/ipv6/af_inet6.c | 7 ++-----
    net/ipv6/netfilter/nf_conntrack_reasm.c | 3 +--
    2 files changed, 3 insertions(+), 7 deletions(-)

    diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
    index 44bb66b..4cd9259 100644
    --- a/net/ipv6/af_inet6.c
    +++ b/net/ipv6/af_inet6.c
    @@ -416,12 +416,9 @@ void inet6_destroy_sock(struct sock *sk)
    /* Release rx options */

    skb = xchg(&np->pktoptions, NULL);
    - if (skb)
    - kfree_skb(skb);
    -
    + kfree_skb(skb);
    skb = xchg(&np->rxpmtu, NULL);
    - if (skb)
    - kfree_skb(skb);
    + kfree_skb(skb);

    /* Free flowlabels */
    fl6_free_socklist(sk);
    diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
    index d5efeb8..dbc013b 100644
    --- a/net/ipv6/netfilter/nf_conntrack_reasm.c
    +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
    @@ -172,8 +172,7 @@ static unsigned int nf_hashfn(const struct inet_frag_queue *q)

    static void nf_skb_free(struct sk_buff *skb)
    {
    - if (NFCT_FRAG6_CB(skb)->orig)
    - kfree_skb(NFCT_FRAG6_CB(skb)->orig);
    + kfree_skb(NFCT_FRAG6_CB(skb)->orig);
    }

    static void nf_ct_frag6_expire(unsigned long data)
    --
    2.6.2


    \
     
     \ /
      Last update: 2015-11-14 20:21    [W:4.051 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site