Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3057114ybt; Mon, 29 Jun 2020 14:08:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtDwNwuY75HErINZUVjIGx4fmMcdzD4Ou1P9hTUXyRf9ZDxvoqjEhCAZN70vjYoULMmyCr X-Received: by 2002:a05:6402:b4b:: with SMTP id bx11mr19158877edb.286.1593464915827; Mon, 29 Jun 2020 14:08:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593464915; cv=none; d=google.com; s=arc-20160816; b=gHLKee9kZQvBqQTDxh84vDwzYLRylMla+0Dd1uCsccoyidXAoZ0/pXaSUfFH3BX/Jy Yh/htkuDytwC5fjJpj1MRxmdDg0DXyUX1xHIaOobhEFh/1HwpkvvpCDaVRqzuCGA34wZ OUq4rkVxwl1KfocIwmXP/WVSn5dUshvV4cHzN666HOfhOkQKkUKiKSl6RvcLtoU9tOJG nQflB7fX0BI8ExyOBeNcWiKSM2DbLVJPf/Qjff6xK1WcYQIfjiuXmFzJoHc6/8KMwfc8 Pb/4oBf1XF4HInto5R2xhQMgrPphuSfttFal361MxFE/cpSOa0Kvuw0R2jJtLQII/zNj RTFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GqBmdgm2PUfWiTFJfb/fmfBB4pPfKjnIyqnZ924oPKI=; b=nAjhN95oYs2BgdGc37gg/Hjcy5l/uroEogHLPomw7l5W6VDS9snTuLUEBVGkmUggxl 5NHC2jgRi31l+gyKQ4E7j/aIZQHF/h6xD1bf2Fwj47jCmP1BDzXIAd3UtOK3xedhW46P RTdsvmn55cIuOTXo7N9B06RvqK8tNDwbF6ViwXOaWIuHkf4jpNdflXfN2YU8UPIru8eV 0WqafxUCjfhm58eFAhGoMSdVfDQTyNaCTOOWd2/EQ7N14XGAyEqP0GunZkavxWd8NwBT qcuBz6nn7Jp2ikBblaY00tjSoYk70isHeSxlZlClKmOG5gNnZPUVT9cu4uksKiKg0tWu 2OkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uQHhyM1l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h17si346390ejd.655.2020.06.29.14.08.12; Mon, 29 Jun 2020 14:08:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=default header.b=uQHhyM1l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390335AbgF2VGz (ORCPT + 99 others); Mon, 29 Jun 2020 17:06:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:53708 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728086AbgF2TKR (ORCPT ); Mon, 29 Jun 2020 15:10:17 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DEE8C254F5; Mon, 29 Jun 2020 15:54:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593446051; bh=sI6OZG+k7ZLpyFDvFmIx4sKJg5MaVVEDi0dbKGmBi00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uQHhyM1lQxF/EdZ8ZkwxeqL3mgJsJgaDR5LQwZSPs8IL7hE0P5d81t/s0BejoKp5G ccSMKOm0XnY4b1ak/d5utC82AojcfQEgwaJyM8ojTxyg5GEEVTxEPxj9lP0vhscRMD 7IXELVxrLwnFAPPgQAdz8MzCB25ttH9jyBfaC+KY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe JAILLET , "Martin K . Petersen" , Sasha Levin Subject: [PATCH 4.4 054/135] scsi: acornscsi: Fix an error handling path in acornscsi_probe() Date: Mon, 29 Jun 2020 11:51:48 -0400 Message-Id: <20200629155309.2495516-55-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629155309.2495516-1-sashal@kernel.org> References: <20200629155309.2495516-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.4.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:53+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET [ Upstream commit 42c76c9848e13dbe0538d7ae0147a269dfa859cb ] 'ret' is known to be 0 at this point. Explicitly return -ENOMEM if one of the 'ecardm_iomap()' calls fail. Link: https://lore.kernel.org/r/20200530081622.577888-1-christophe.jaillet@wanadoo.fr Fixes: e95a1b656a98 ("[ARM] rpc: acornscsi: update to new style ecard driver") Signed-off-by: Christophe JAILLET Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/arm/acornscsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index deaaf84989cd1..be595add8026b 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c @@ -2912,8 +2912,10 @@ static int acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ashost->base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0); ashost->fast = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0); - if (!ashost->base || !ashost->fast) + if (!ashost->base || !ashost->fast) { + ret = -ENOMEM; goto out_put; + } host->irq = ec->irq; ashost->host = host; -- 2.25.1