From patchwork Mon Oct 24 11:30:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp441340wru; Mon, 24 Oct 2022 06:05:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4QExdaa/LRZgFrDqmjp49Omx+Jy028cF+y7pp2XhPav4caNTye1hwHTU4P3glCGgnYcahA X-Received: by 2002:a17:90a:d588:b0:202:aa2d:1022 with SMTP id v8-20020a17090ad58800b00202aa2d1022mr74714048pju.31.1666616747092; Mon, 24 Oct 2022 06:05:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616747; cv=none; d=google.com; s=arc-20160816; b=GZSva5y9JP9Kr2MLJxZuVVlZXZXLcuY6q55hc0Wp28QSn7W6NiR8zJzA6GTdmiMvKG Cgcse7+EFeSMiRAWpdvAjpSZ4EgfdM2JeigVjk43vMe5l4gg6T0hR1KyoMzzRuCNKIyP 0ycpS23rYNbWKXHNOyAf6MznbWQIrrkJrr8Y9QsH9nTSJ40H/RX9od4/rF2Rt/EkZ+jj IhbZlW+tkugq5PqTVm13bWk4Ey0uvbLmSZnyNvkFe6rpJ8vrJ4IR2T3vZVF8I3K5eeQQ FpximaRThnWuGi/S1yei/ugI0SB9HCnURra0v5oA/YkGAbxMhdDMbdDv0CtRp1ua5o6S c1MQ== 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=NnoGBOX7oRpgOlnKc+7dMO76eHKbubbKeIee0TxYfCE=; b=v9htA4MhngJfRoX07VXkHN/qr/Q9gWSdZ7ydjCX+OHPR+J05euaIi4XyZfPOYvnJO3 3eLnUVsaKog/ak9+paXg5599WVXIn/xMV8/xG1DA4tgnp/Fw/dDYW0g55+a91LlDB9vo 821ySxcQwqhRJWvnlxfF7210cmOY8rtTUxwKTrXuXSL7c7bFbdiOC28orR6nM/NhDAed L7PuZltfvcFXtO1rkTny6Q64gFFZasuN9saqqGEFqjES+kLJw1PwEQmTK890agxThVPl dUmTDicJDR09j9CNydW3Ahj7/UX3asZE3H5DqeQE+8LH4NLMX+irvqyjJBT/MNeT4FTt p3gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kQPqNYtS; 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 j69-20020a638048000000b0046ebb32e9d4si12057740pgd.737.2022.10.24.06.05.02; Mon, 24 Oct 2022 06:05:47 -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=kQPqNYtS; 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 S235264AbiJXND7 (ORCPT + 99 others); Mon, 24 Oct 2022 09:03:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235378AbiJXNAF (ORCPT ); Mon, 24 Oct 2022 09:00:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E75811834; Mon, 24 Oct 2022 05:19:31 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 06E9A61290; Mon, 24 Oct 2022 12:10:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 155EEC433C1; Mon, 24 Oct 2022 12:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613432; bh=erp1Dq2cXRI9kYCT9NdeySqx+z3DNa6n189hM0YEwPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kQPqNYtSN4hxLetGoU/ZDrEaJP0lCglc7dFh6l5rY2nYskAwRYDgiGLL4FmYKRgB2 CaaZbWZfhrSHVwVZRVqDxXbHFO4L1sbXVNVoukltnmZur6ostGbRTT+eN0/7JUr1pC NJn0s51qa8dNdqUTggVfZ3wMPxyBzL7XDULhPhVU= 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.4 135/255] RDMA/rxe: Fix the error caused by qp->sk Date: Mon, 24 Oct 2022 13:30:45 +0200 Message-Id: <20221024113007.067610368@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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?1747574322245157361?= X-GMAIL-MSGID: =?utf-8?q?1747574322245157361?= 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 be3eff792864..89f6d54a4312 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c @@ -847,8 +847,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 */