From patchwork Mon Oct 24 11:30:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9893 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp572307wru; Mon, 24 Oct 2022 10:34:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/sQv9ZCdEdB4sbdV1FfUFB99OGZzmZcj0NTdyXwQ8MIwwK9O3KiUEwfpB/xCuF9/GE1gq X-Received: by 2002:a17:903:50e:b0:182:631b:df6f with SMTP id jn14-20020a170903050e00b00182631bdf6fmr34721774plb.66.1666632897581; Mon, 24 Oct 2022 10:34:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666632897; cv=none; d=google.com; s=arc-20160816; b=SS5FfTY7ARr1GhesJoOqdpBeMGl9vr3e2Zx5e2RnlVw/T0Bvo00VWQ6Zn5t42x7Ouo n6PHBS2YhO9RD5tltcvQU3TPhAJBmytkTig5V6bzzbxORluyr3eRny1E3wr/+oi6pnp9 lkiOU5tPPp/Z9i0BhAb/SelA8eDP6qyhk3Oe+PhBHYFyo80U0MiIOyJT9a55d7zuEyIU 7lAPTYP6moj6p9vhqMlcRUWuDtEraHbQbRrd6QYKIHPEDFMd8X0vkLOA1A8UYb/WoG2P EH3Y2Ki/Zdduk6c/yCg9ECyzSfOK2ctq+IyCGMHlxZ8Mf0AjlapjzW7aHLX5RTUBUPRb 3A8w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cfbodcUTSWMm6zooZnZTaga8NjUyDTIDvp3efjPx5EI=; b=krq6E86PNbs9qYfnwOQ4z89RMbxIfq+iycaCPy6RWhFZZd+JsAysb/dqOmpDC19CcC 6lfTl6eE029GnrXdrmv3448MqpZ1u31EC1e3PHZvXdeYbuUNfDjf7vwVqtGhsLZFFTTo IrUSV/RJSg6KyUf1zrgRYSKSp9ci79Fr1hbgYz+1PbFher2nD5nrh2JKs+8kFGLYGAbR ePxTXthIQBRllW4O1xgBeJkytsOL2G4/v75iaFu1OvVTLQo+2zB90KCr36D5yOj+Jm4f FUPTlAyCgKbRVwbrfvQJlvjXIyAlS0wMck/x9/BYmT3L/LY/UHPNlXkH5aebmsRLH2Z/ XazQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kuaTJCt2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a17090a604600b00213120e0c85si3529244pjm.156.2022.10.24.10.34.44; Mon, 24 Oct 2022 10:34:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kuaTJCt2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232875AbiJXRcc (ORCPT + 99 others); Mon, 24 Oct 2022 13:32:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232458AbiJXRbx (ORCPT ); Mon, 24 Oct 2022 13:31:53 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 208AE11F4BA; Mon, 24 Oct 2022 09:07:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 63948B81665; Mon, 24 Oct 2022 12:25:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B515FC433C1; Mon, 24 Oct 2022 12:25:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614308; bh=bOzId59+foMHXeXiHrSonKvaR0UFFwp8Mwmij77g26Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kuaTJCt2TMe3lGGcoW7I+uKa62U7+m45tPNZEWZTVrsmScC4q8eHsnMpOKEkhg5F7 2nTQFfjoPfpYm3QzlYZPE+io7bRInDlbaXvn58wdFPnzQX1x55jhD277PSdAnn0QAz MXpQItqNqhjbyDrzKkmbJW4dDlxqAqGLXDk5uf60= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhu Yanjun , Li Zhijian , Bob Pearson , Leon Romanovsky , Sasha Levin Subject: [PATCH 5.10 211/390] RDMA/rxe: Fix the error caused by qp->sk Date: Mon, 24 Oct 2022 13:30:08 +0200 Message-Id: <20221024113031.773007271@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747591257189566132?= X-GMAIL-MSGID: =?utf-8?q?1747591257189566132?= From: Zhu Yanjun [ Upstream commit 548ce2e66725dcba4e27d1e8ac468d5dd17fd509 ] When sock_create_kern in the function rxe_qp_init_req fails, qp->sk is set to NULL. Then the function rxe_create_qp will call rxe_qp_do_cleanup to handle allocated resource. Before handling qp->sk, this variable should be checked. Fixes: 8700e3e7c485 ("Soft RoCE driver") Link: https://lore.kernel.org/r/20220822011615.805603-3-yanjun.zhu@linux.dev Signed-off-by: Zhu Yanjun Reviewed-by: Li Zhijian Reviewed-by: Bob Pearson Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/sw/rxe/rxe_qp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c index 6acef6e923de..2e4b008f0387 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c @@ -817,8 +817,10 @@ static void rxe_qp_do_cleanup(struct work_struct *work) free_rd_atomic_resources(qp); - kernel_sock_shutdown(qp->sk, SHUT_RDWR); - sock_release(qp->sk); + if (qp->sk) { + kernel_sock_shutdown(qp->sk, SHUT_RDWR); + sock_release(qp->sk); + } } /* called when the last reference to the qp is dropped */