Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp4894642pxb; Tue, 25 Jan 2022 23:25:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjo3oA/7i21AgyDqzMyrKnNeoZIbm2qnqOZlifBjgY4WZmMiL/EYAXzT6p/Jqg53Tdoqd4 X-Received: by 2002:a17:906:2e8b:: with SMTP id o11mr18951627eji.390.1643181946273; Tue, 25 Jan 2022 23:25:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643181946; cv=none; d=google.com; s=arc-20160816; b=XbMWqIGFsTTwmcA8wBi+ivArf9Wg7pCfVnPvVvyo55Jb7CVDC0+7CjD+moZQBHsHky 0CW96iJAhLEnj4IlroTZSoT4k5VFZkxPly2hXouy09wZzrX9WrLvO4H+d24Aw3TnetIt 7r7uW+ST9P2oCyRuieHQS9TsxgjFfpZFCnS4LCHzcgI+zvey9rrNNL64j/+Y6/UauqWc cmtWHZQWy8tUS/t50+viN7KRpZT6QJFgMGjIa9Ep22sH19SfVQLuZW+kreE9W+tHKTt0 d7Gdzohmt+EBockZLPurz7kuQtcIeP/VgZuAJh59yh8oUn3qwi/xHbaSLwdtUnzKjJ9Y TBcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=SmvWx14eAhy3pe3g3Tx/t4BuExsjjc5XxE2U64XG7T8=; b=mGAUkr7hKOKJLFw9XnHDNzz8H0TU3IUNyw9lIXrOUwcvItwC6bkIfFrJ+Rs7MA32Fb ltvsMm+vgyIAOyqPiWU6waSzCgctIjDeOkIr2tlL8SB++KXx6dT+7qBlHd6Z/20NTkMg 6e4K9YLcDXWIPHRPBMLvuYzNNqMyCM8hRkwBZrW4XX6i8sifH0GnQ6E7kaUUbAj/pQMC 13oBaKR9bh6DpFOWbsS1V2o0xssFEtoPD5f3T8dyax29QQZZfJf97JSegaVcT10uNL7V tPre/ZGU3BQ5XAEDTSMDNtoiFnBLMjnUWAmrZCHQsRmi5chpqFZ5fokIIYTsRDSUOBcY Vlow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@vastdata.com header.s=google header.b=LuEM7YNm; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b11si5355589edz.444.2022.01.25.23.25.16; Tue, 25 Jan 2022 23:25:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@vastdata.com header.s=google header.b=LuEM7YNm; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229714AbiAYTRX (ORCPT + 99 others); Tue, 25 Jan 2022 14:17:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229732AbiAYTRV (ORCPT ); Tue, 25 Jan 2022 14:17:21 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAF67C06173D for ; Tue, 25 Jan 2022 11:17:20 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id s18so21711095wrv.7 for ; Tue, 25 Jan 2022 11:17:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vastdata.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SmvWx14eAhy3pe3g3Tx/t4BuExsjjc5XxE2U64XG7T8=; b=LuEM7YNmtZzEJWdGuYQA8ha6rk0vHFi0F67a0JH+91/b+j2BwnIImJm/wZoeDLznbl luOUJLZU3bIRC4znGmPQBYBeKwulcGyW1hXkPkt1Zq62CAWzV907Lk+r30e4jyJvHRnx Cz8lhcpT7KFg765nC7EGu5gOZIkuxuxvHFONZjZN9s8/qhufwhaiqRA3ay6Al6rwGzHu 8u8KxmD0xyu6jF7g2Q9p0XG3cva0F/3GtoqACM6EcUpkccZ3tmciHb8qLrGnbMBbPiQ3 2vYGX4t6PRg+ymkiZydfSkoeC5Mpdn5vbbtUDxLCSQNpt1Xx9BfmhrWqDYhRH8abaEBh CjMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SmvWx14eAhy3pe3g3Tx/t4BuExsjjc5XxE2U64XG7T8=; b=s9tRMwYG9V3ikDyYlDuY4SOGk3mM1LZyWFclcr8/RE5GUgxfzuDkkc7DgyEUq5jHMf 3MPTDf8gQFXQnof5I3F6dERwDESPuUPirPqOymv/KSTJja0JJrEBtzSpc3Yont//Yu8+ moupYzCXfhq7LE2RWDsP9CEwFspVxVvGTrEVuUMd/PtkUFbISTz7gBE5C+yQWt4FpUG9 tfyA6Z5fGQ4AvNxt1nkKakzro3+9e7688fWgH/JlpWHcBjre5ajqcNEo77UoXjz/BJsu 7UPesabx8jmwP78j3O/1uDC42tNpdh1H2+kRYnkJL/A5Mz7+12Wji1JBzp2xEYnaA1wl gPLQ== X-Gm-Message-State: AOAM532/4LvjOedVWrUXZ6EJxzvadBstX7vZYKGYDjpcdHTLNbvl8Ae5 0UIciKwQGWasoXLNnajoo2vcsjSfCOWc+w== X-Received: by 2002:a5d:4944:: with SMTP id r4mr19725863wrs.550.1643138239522; Tue, 25 Jan 2022 11:17:19 -0800 (PST) Received: from jupiter.lan ([2a0d:6fc2:4951:4400:aa5e:45ff:fee1:90a8]) by smtp.gmail.com with ESMTPSA id t17sm17847069wrs.10.2022.01.25.11.17.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jan 2022 11:17:19 -0800 (PST) From: Dan Aloni To: chuck.lever@oracle.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH] xrpcrdma: add missing error checks in rpcrdma_ep_destroy Date: Tue, 25 Jan 2022 21:17:17 +0200 Message-Id: <20220125191717.2945308-1-dan.aloni@vastdata.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org These pointers can be non-NULL and contain errors if initialization is aborted early. This is similar to how `__svc_rdma_free` takes care of it. Signed-off-by: Dan Aloni --- net/sunrpc/xprtrdma/verbs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index f172d1298013..7f3173073e72 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -336,14 +336,14 @@ static void rpcrdma_ep_destroy(struct kref *kref) ep->re_id->qp = NULL; } - if (ep->re_attr.recv_cq) + if (ep->re_attr.recv_cq && !IS_ERR(ep->re_attr.recv_cq)) ib_free_cq(ep->re_attr.recv_cq); ep->re_attr.recv_cq = NULL; - if (ep->re_attr.send_cq) + if (ep->re_attr.send_cq && !IS_ERR(ep->re_attr.send_cq)) ib_free_cq(ep->re_attr.send_cq); ep->re_attr.send_cq = NULL; - if (ep->re_pd) + if (ep->re_pd && !IS_ERR(ep->re_pd)) ib_dealloc_pd(ep->re_pd); ep->re_pd = NULL; -- 2.23.0