From patchwork Mon Jul 19 14:50:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479958 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4245683jao; Mon, 19 Jul 2021 08:43:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiEKnw8Q79F+Ls1fT7Q9NGdTGra3g9y5wnknUaKv5gFRG93l4UW00g2mhmhFS3aVhM5UOO X-Received: by 2002:a02:c491:: with SMTP id t17mr17684125jam.56.1626709412436; Mon, 19 Jul 2021 08:43:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709412; cv=none; d=google.com; s=arc-20160816; b=iFLNl/xOl4WxYL5cm4O39G4EUFPVmAY8e2Fw4nrLYX6JdABAeRqcxoMfm+xuY1FFFf mKC0Ud3qLQTgc147boFAK96FxblG0LE72C8XPDmc7PKFW7kLW3i7NeKbctNoUB/AdYqO gZDC1DSaNYHDpYp9+654nwiR6BI888UULE7tH5AnUhQe/ntkfqRMiyK1B8aSur0cC6vO lzAkZmJsrm6iT4hOx0xtRFukGASFYslmUPEf1VZZ/htq0kDb3RGzGPdb0UVSQMK5ZcSo 1Znxq0FiiFSx7GWCTQ6r7MATVxtBVv/bnB3y0uPGt7Bgde/UZ60ApLMEhwZ6QzNqSHjk gWWA== 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=Bv65tBxw4YX1jMHP/D06AGYtrNX2rI3CAxCeWSyOKzE=; b=DH0+iSDfGomeXLg7pgrIXNL8+Aqw7zBttaH270zb2njDt2MFhonyZ6vPxD2lg7NlRY 3NMwroq/EOs76+NKaWhyJXbhPz8B5gXgqJL4XN9s/tJVyCpDvblA+zXDGw77RS4Pvfm4 UMfEicr5zqKGlnnx0qdCPwgeD8Vtsz82zsRXWMbbMjrgco7QqSzMokkwxTiO/dVgk1I5 S4gAKJCAWWPWhtc6r1gspExOXOaek+LgFOB27BdogAgrdCFFX994XJMQOT5lS33e9Y66 Tb+3+Fyj9j0kzWYeMBIGZ1n9eCV4pDB//z22wp4w6Ny5xoGvCTqmIvrz8PvOIBIArEKe EUgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Jzktbqw5; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ay16si21406520jab.96.2021.07.19.08.43.32; Mon, 19 Jul 2021 08:43:32 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=Jzktbqw5; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S237434AbhGSPCu (ORCPT + 12 others); Mon, 19 Jul 2021 11:02:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:53516 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245695AbhGSO64 (ORCPT ); Mon, 19 Jul 2021 10:58:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E813261249; Mon, 19 Jul 2021 15:36:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708992; bh=dQHPK9uL7ryLZeMg+/OSAcIhQpzOm1oHyHn0bJECNCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jzktbqw5Yse+5AvpKklbZ9njynw2O/5HjfEb8+y481IuxgC0CFp4oh0RgOUA3Xquv /XJuvRsenv5EHg/lsW764iI82DP7Fon8cE3kQtGZtoJfZHBF8pZVCPfWil0j5MRGjy O/vA7CFLPFN8dqVLoBvqUqHbFfw5eTwsBD0X4x/M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.19 210/421] scsi: mpt3sas: Fix error return value in _scsih_expander_add() Date: Mon, 19 Jul 2021 16:50:21 +0200 Message-Id: <20210719144953.632532134@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit d6c2ce435ffe23ef7f395ae76ec747414589db46 ] When an expander does not contain any 'phys', an appropriate error code -1 should be returned, as done elsewhere in this function. However, we currently do not explicitly assign this error code to 'rc'. As a result, 0 was incorrectly returned. Link: https://lore.kernel.org/r/20210514081300.6650-1-thunder.leizhen@huawei.com Fixes: f92363d12359 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 5a5e5c3da657..add699b01836 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -5745,8 +5745,10 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) handle, parent_handle, (unsigned long long) sas_expander->sas_address, sas_expander->num_phys); - if (!sas_expander->num_phys) + if (!sas_expander->num_phys) { + rc = -1; goto out_fail; + } sas_expander->phy = kcalloc(sas_expander->num_phys, sizeof(struct _sas_phy), GFP_KERNEL); if (!sas_expander->phy) {