From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEF89C4332F for ; Tue, 7 Nov 2023 16:01:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235291AbjKGQBU (ORCPT ); Tue, 7 Nov 2023 11:01:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344706AbjKGP7b (ORCPT ); Tue, 7 Nov 2023 10:59:31 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 107C91BCB; Tue, 7 Nov 2023 07:52:25 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BDA8C433C8; Tue, 7 Nov 2023 15:52:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699372344; bh=Y+8mRrkWRM7PClGF+WGyXe3kK3zrXr/PDvE40lBrRKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O3T73U15aXv3FRmr/wtVAgyINEVMM+JgaHGSNOySW7xNQ4mNYnX+LPDXZPZAaG3KW olyrsrQp28ZOSMaROqw/8nbqGbx5qsfecO4msbf7o3FgN5htW8rVk7P17f2mDZjOiJ w0+cuQcS5wbSboVJVqfx3zHRsZ6idIvuD02nsWqEjeFClHWRLbpM+zlQ1bceJn+6IS oglKJwnvoN2hcYvcqIr3bcexXWzO0NmNou18g948ykDrKzp5l5wP0SIGWd4lwHyxaa GyBdDIcTtGvis2XExiMtxaXwryGIBfkeE+pThZsMr6WfDyQVADbN1oufTPpeHbRPxr Ynae0sATdjqCQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenchao Hao , Simon Horman , "Martin K . Petersen" , Sasha Levin , hare@suse.de, jejb@linux.ibm.com, richardcochran@gmail.com, linux-scsi@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 15/22] scsi: libfc: Fix potential NULL pointer dereference in fc_lport_ptp_setup() Date: Tue, 7 Nov 2023 10:51:24 -0500 Message-ID: <20231107155146.3767610-15-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107155146.3767610-1-sashal@kernel.org> References: <20231107155146.3767610-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.137 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wenchao Hao [ Upstream commit 4df105f0ce9f6f30cda4e99f577150d23f0c9c5f ] fc_lport_ptp_setup() did not check the return value of fc_rport_create() which can return NULL and would cause a NULL pointer dereference. Address this issue by checking return value of fc_rport_create() and log error message on fc_rport_create() failed. Signed-off-by: Wenchao Hao Link: https://lore.kernel.org/r/20231011130350.819571-1-haowenchao2@huawei.com Reviewed-by: Simon Horman Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/libfc/fc_lport.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c index 19cd4a95d354d..d158c5eff059b 100644 --- a/drivers/scsi/libfc/fc_lport.c +++ b/drivers/scsi/libfc/fc_lport.c @@ -241,6 +241,12 @@ static void fc_lport_ptp_setup(struct fc_lport *lport, } mutex_lock(&lport->disc.disc_mutex); lport->ptp_rdata = fc_rport_create(lport, remote_fid); + if (!lport->ptp_rdata) { + printk(KERN_WARNING "libfc: Failed to setup lport 0x%x\n", + lport->port_id); + mutex_unlock(&lport->disc.disc_mutex); + return; + } kref_get(&lport->ptp_rdata->kref); lport->ptp_rdata->ids.port_name = remote_wwpn; lport->ptp_rdata->ids.node_name = remote_wwnn; -- 2.42.0