From patchwork Sat Oct 22 07:24:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7452 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1098538wrr; Sat, 22 Oct 2022 01:11:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5kf97DAFbrOLQl7ucRSGzfAihWsKafF2Sfp3rMfQ7ql/ZN4hw4PYhgAyP62WKCEWSVx308 X-Received: by 2002:a63:985:0:b0:46e:e3b7:65ca with SMTP id 127-20020a630985000000b0046ee3b765camr501878pgj.331.1666426270216; Sat, 22 Oct 2022 01:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666426270; cv=none; d=google.com; s=arc-20160816; b=qDkvM/R0EwPinVgTHNZQtwgkonh2XdeAbmEZnrNqdYQ/nF38vUM3L7hATc5D4JypcM e/hGyz4jQHx0f39O04XU3Q7fiogjlS/OfWI8iEL5QaZ9D0yyXBXLpLGkaozHTxMTXyVA KVIkYUo/VZAjBrB+aKI+GagDrQs9LXAtk5Q6JLPCa3syzUpSWALI9WJm1L74jPba3Hge ktLVIjdZQdKiA92Y7i42GORSXeSJ0g0+/uhd/bNsi/8cs546IUbSfo1DemqALfSAE/4l I+Cuaj2iWTO3TMbDCa4UCRKY3b+x1ExpIANBcFJVjUCO9YE6aDmxwmsrylXo9CUZG2xO aeQA== 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=Jo4LxztqhG3TGDeH/XBSdrhsmlnRSRXyUgIbFDGUZjo=; b=NuQRoVX1VyDX3fxHNiw57/s54DmFnwPD7+YX61tvmQIacVzt4Gp4SZkr26TgO4R+qC Ae6bjw7xuRjwmK3oevEdg7oqNNqHJgA0QIC94dT3iaX8ZvdPFrjxwqcbSM8P9m/jpR1Z b6d/15X70CujL3SuGnQCC42+53yeY39KNmu3jfZYAjXHG7WrcEIs99tqUqMC4KbcXaf6 T8F2zjx8Q+ZhVZBsReW+8YrHVupXYa2aHSsZaFo8WR7tXa6gfFMBxPX90+PierWaO+Cu hpFlxXgejLOwi4KTJ7ocR2iT7msNNEW3KGKSJX2xburLxz+z04431bNIkZkM7S/M0AXJ IR0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=n3jgRCkX; 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 e4-20020a170902b78400b0017f7de32cc2si25634977pls.129.2022.10.22.01.10.54; Sat, 22 Oct 2022 01:11:10 -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=n3jgRCkX; 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 S233502AbiJVIKD (ORCPT + 99 others); Sat, 22 Oct 2022 04:10:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232791AbiJVIGC (ORCPT ); Sat, 22 Oct 2022 04:06:02 -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 E01812C6E3F; Sat, 22 Oct 2022 00:52:58 -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 A4C39B82DFD; Sat, 22 Oct 2022 07:52:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAD40C433C1; Sat, 22 Oct 2022 07:52:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425143; bh=3R8E4rVNPKIXYCymFwwbRF9R67xBhTsT1o8q8+WQvN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n3jgRCkXrqdR1QaEUPm9cXZxG13J/pF3Fx5F75ph581ly2CV6srx6vXMOaptXDgra qQ2G9jn0t9hyF6q0Ci4j6OzFr3k00lUUSq4MtBBOlT29yfD4LZEcDf/enH9UZkL7zw AWMIYs/UOamtZNoWtMh2mHgUzhev7L5/SMlxZGD0= 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.19 405/717] RDMA/rxe: Fix the error caused by qp->sk Date: Sat, 22 Oct 2022 09:24:44 +0200 Message-Id: <20221022072515.868172641@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747374592619990148?= X-GMAIL-MSGID: =?utf-8?q?1747374592619990148?= 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 173a4253406b..3df2db893dd3 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c @@ -832,8 +832,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 */