From patchwork Mon Jul 12 06:11:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472920 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2661915jao; Sun, 11 Jul 2021 23:52:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznpLhPYp9v43wWmPVVIleaDBE71k6QVh7qgCdXaJuCXiC9aVrqUiq0HTadVLoevlnoEDcl X-Received: by 2002:a17:906:aac8:: with SMTP id kt8mr14515611ejb.246.1626072751518; Sun, 11 Jul 2021 23:52:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072751; cv=none; d=google.com; s=arc-20160816; b=BjIqpxTCzOv3YB4S3ZLc5Wm3PM2UaHO9x2UX+r2w3CvTgUWR7Qf1MXtmcv4ZtAn7Up Z3BHm3HtWk7Fq2nqeULykwLh+SqOpbfuNLaxldd8+1mKS3Ffkax8JtRYTZ+3+LvcJgdo PP2OQRwf5ICO5+NlFtPXKJX5uJ42ixFxnx6TLaXMpKK0MNfJghsToGNPsgpnQnXZxxmb YMEkxQSrgas6j5i97zYc8OxTnqC7FrqQ2fuJBXPby25HYxYNzFRWKFYs9o8NfYc9Lw5T Kk3q/795BIaTOHsBJvyhktAsSXAuDBTBOXruVAQ/HAn+UtT6cHDPtOoCs+R0isymuldG D2uw== 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=343vctGJ++syRLb2Rh4VJnVegOvrLb4uxPEmKSdfw48=; b=jMU8bcDr4n3lcPFSXyw7AP3HVJRgHY8SpRPA4cgG2O5GRmQ5OTdp4X8Q2nN4WpbVji ubPLi6M8FBuLQx04Ovp1ho7RMUlW+OrBpF/uuA7xlX/jOkqwtDLZKvXOTNynH4Dwl+Jg DiFo3AiGhWOq9a9YbowSIUAyUW85jrNaZsNNuVqvlzoHWVNC4X1YAWM0dY8uXLPSIILP YtqPfYko3WLaqYh8iqmUH+kPXP2/ogXqhQlJ0kngY1hLG987g1kOhxnIiUCsGrs7mfvd H23xBmU2LBFEeJNKJe8UoHgOxSSr7BHsCNJ7yRiOxeKvmlFM3cfVM0ocEL+DB1Aweg6+ hoAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vW3O4tmg; 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 r25si3440466edp.437.2021.07.11.23.52.31; Sun, 11 Jul 2021 23:52:31 -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=vW3O4tmg; 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 S240521AbhGLGxj (ORCPT + 12 others); Mon, 12 Jul 2021 02:53:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:51242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240533AbhGLGv4 (ORCPT ); Mon, 12 Jul 2021 02:51:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3B87060FD8; Mon, 12 Jul 2021 06:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072548; bh=u914ErGaluc5ER9lbT6rup3s/oPVv5BAXS4dYBfNTck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vW3O4tmgnfmfU5rQ0ig+9NGFc4cjoegD+IO4TGdbW121vPxaszub64aGpaFNj70J9 2EsKYZkK3JFNAzWGHR94dRWfXnq8wZjvBuTBMqxOIUUpmGvMp3f+Haib3YKkTIfYU4 yRUHEoOWPubUoqqAOGIN3YD0xerKSq0e8aictwX8= 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 5.10 535/593] scsi: mpt3sas: Fix error return value in _scsih_expander_add() Date: Mon, 12 Jul 2021 08:11:35 +0200 Message-Id: <20210712060952.495010049@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@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 5f845d7094fc..008f734698f7 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -6007,8 +6007,10 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) handle, parent_handle, (u64)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) {