Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1796492imm; Thu, 20 Sep 2018 03:05:33 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZkKrHho7pGQWPV9fV8cr6RlKYG2uXBF2bFt4j2bezZPc5mxBRygumVXoVBZc51RIdbTckg X-Received: by 2002:a62:7510:: with SMTP id q16-v6mr1162142pfc.225.1537437933292; Thu, 20 Sep 2018 03:05:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537437933; cv=none; d=google.com; s=arc-20160816; b=hNsVQTR3xQAqCPlJBkNOPF9/0/zsDX8roZVCfgohgz8unstahbZ8YU4rKCITf+6WQ2 tQAzRsFDdyyt+rRCZ/YzZkH9rQU0e3S5kOyWqmACz9+bEHAnl5oK3x+AIcrT58ATTi6H lRy6deuRL9e3qli5qjF7c/rkk/ToSSuEY8mX6JiYKEY11+woxLHhqgeY6dOmXeOxT3TH A3x2WOztnvoqPsvke88mJmpIl5/wRN0HLE+xH1x5F34cvnsVXt3Wm3vjOrNUPeSKOLaI jP72HZKEM4VhBh+msptiUkSfWMf1X79kRb3pOvnrpBIltI7+1YtnGtu4lEbJApbth26l j1oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=FaLftVGXnWHSCO/LdzeG+Kh88i4+O4/j205auN68fdQ=; b=LeId2bImLwbmuMKLSnYMf2yx14Ao/qFFgsK1uTGdDUbOUWHuGWQNY9pRVLRNBqXg9L U/853j87k8R+pt4Pm3/0QDIxE/S1YqePJKK1HQEJOMwFMYpYpKqmHK76Byi7ryQw9JLX jTCltujrZ6RFaCgoI5nxK8ydGJbLULg45MNKmY2uj+Gn4W3PhqCKwU9s/Wu9YStNyNBg LlJhBL90q5+XKPdvX70GSAopb5KdD8vbO04z+dSYv0ucqSQrboeV4EZuYiTVKd39NZEI p55HjBZ6ARRQ0m6gnYlK0cI2Cf9dNbydeOf/vgVB1UQn+nb77xYqG/Ti9tz8X/zZaImC /lCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h185-v6si24961918pfc.172.2018.09.20.03.05.17; Thu, 20 Sep 2018 03:05:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731640AbeITPrt (ORCPT + 99 others); Thu, 20 Sep 2018 11:47:49 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:38081 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726990AbeITPrs (ORCPT ); Thu, 20 Sep 2018 11:47:48 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id C7150262791DC; Thu, 20 Sep 2018 18:05:04 +0800 (CST) Received: from linux-ibm.site (10.175.102.37) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.399.0; Thu, 20 Sep 2018 18:05:04 +0800 From: zhong jiang To: , , CC: , Subject: [PATCH] RDMA/cxgb4: remove redundant null pointer check before kfree_skb Date: Thu, 20 Sep 2018 17:52:42 +0800 Message-ID: <1537437162-42846-1-git-send-email-zhongjiang@huawei.com> X-Mailer: git-send-email 1.7.12.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kfree_skb has taken the null pointer into account. hence it is safe to remove the redundant null pointer check before kfree_skb. Signed-off-by: zhong jiang --- drivers/infiniband/hw/cxgb4/cm.c | 3 +-- drivers/infiniband/hw/cxgb4/qp.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index 0f83cbe..615413b 100644 --- a/drivers/infiniband/hw/cxgb4/cm.c +++ b/drivers/infiniband/hw/cxgb4/cm.c @@ -403,8 +403,7 @@ void _c4iw_free_ep(struct kref *kref) ep->com.local_addr.ss_family); dst_release(ep->dst); cxgb4_l2t_release(ep->l2t); - if (ep->mpa_skb) - kfree_skb(ep->mpa_skb); + kfree_skb(ep->mpa_skb); } if (!skb_queue_empty(&ep->com.ep_skb_list)) skb_queue_purge(&ep->com.ep_skb_list); diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c index 347fe18..e78dd9a 100644 --- a/drivers/infiniband/hw/cxgb4/qp.c +++ b/drivers/infiniband/hw/cxgb4/qp.c @@ -2813,8 +2813,7 @@ struct ib_srq *c4iw_create_srq(struct ib_pd *pd, struct ib_srq_init_attr *attrs, free_srq_queue(srq, ucontext ? &ucontext->uctx : &rhp->rdev.uctx, srq->wr_waitp); err_free_skb: - if (srq->destroy_skb) - kfree_skb(srq->destroy_skb); + kfree_skb(srq->destroy_skb); err_free_srq_idx: c4iw_free_srq_idx(&rhp->rdev, srq->idx); err_free_wr_wait: -- 1.7.12.4