From 5cfe53cfeb1c05b73e5f2e09d7fe3140b17c1204 Mon Sep 17 00:00:00 2001 From: Yang Yingliang Date: Tue, 30 Nov 2021 11:12:43 +0800 Subject: [PATCH] mctp: remove unnecessary check before calling kfree_skb() The skb will be checked inside kfree_skb(), so remove the outside check. Signed-off-by: Yang Yingliang Link: https://lore.kernel.org/r/20211130031243.768823-1-yangyingliang@huawei.com Signed-off-by: Jakub Kicinski --- net/mctp/af_mctp.c | 3 +-- net/mctp/route.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c index 871cf62..c921de6 100644 --- a/net/mctp/af_mctp.c +++ b/net/mctp/af_mctp.c @@ -405,8 +405,7 @@ static void mctp_sk_unhash(struct sock *sk) trace_mctp_key_release(key, MCTP_TRACE_KEY_CLOSED); spin_lock(&key->lock); - if (key->reasm_head) - kfree_skb(key->reasm_head); + kfree_skb(key->reasm_head); key->reasm_head = NULL; key->reasm_dead = true; key->valid = false; diff --git a/net/mctp/route.c b/net/mctp/route.c index 46c4482..8d759b4 100644 --- a/net/mctp/route.c +++ b/net/mctp/route.c @@ -231,9 +231,7 @@ static void __mctp_key_unlock_drop(struct mctp_sk_key *key, struct net *net, /* and one for the local reference */ mctp_key_unref(key); - if (skb) - kfree_skb(skb); - + kfree_skb(skb); } #ifdef CONFIG_MCTP_FLOWS -- 2.7.4