From patchwork Mon Dec 5 07:24:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 9460493 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9D8E66022E for ; Mon, 5 Dec 2016 07:25:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 874A124EE5 for ; Mon, 5 Dec 2016 07:25:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BF1525EA6; Mon, 5 Dec 2016 07:25:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EEAF24EE5 for ; Mon, 5 Dec 2016 07:25:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751530AbcLEHYj (ORCPT ); Mon, 5 Dec 2016 02:24:39 -0500 Received: from m12-12.163.com ([220.181.12.12]:33373 "EHLO m12-12.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751176AbcLEHYg (ORCPT ); Mon, 5 Dec 2016 02:24:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=3Id3J7eonrF13Z4O+Z jQDq0/3NjLypMwr7HKhiMYAFo=; b=AvMCEzzzblaxkxUbtQI9rdCdZgKxEsHrQV LVdJMu6UecWYNVz/1WyueR0WH1IsBhs79dz5WRwtlSESGmD8GDRgY8S1BtRdOqFD TlNyJtag2BB8XXS6cksUb3JGcpPkDc14yjM6lqdfjaYmyt7+Sv3yOD/fnji6EHy+ lh+C7nFWE= Received: from localhost.localdomain (unknown [106.120.213.17]) by smtp8 (Coremail) with SMTP id DMCowACnCXwiFkVYjbj1Ew--.18742S3; Mon, 05 Dec 2016 15:24:20 +0800 (CST) From: Pan Bian To: Jitendra Bhivare , Subbu Seetharaman , Ketan Mukadam , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Pan Bian Subject: [PATCH 2/2 v2] scsi: be2iscsi: set errno on error path Date: Mon, 5 Dec 2016 15:24:19 +0800 Message-Id: <1480922659-19308-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: DMCowACnCXwiFkVYjbj1Ew--.18742S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7GrW7Jr15urW8JrWDXFy8uFg_yoWktrX_uw 4xKr17W348trWfCw18Xr9xZF929rWUXws7uw1aq34SyryUu3sxJF1rXrn5Zrs3uw4xZF1U G3Z8Ww1SkwsrCjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUYzv37UUUUU== X-Originating-IP: [106.120.213.17] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/xtbBzwE3claDsdY5EgABsT Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Variable ret is reset in the loop, and its value will be 0 during the after repeat of the loop. Then, if pci_alloc_consistent() returns NULL, the return value is 0. 0 means no error, which may make it impossible for the callers of beiscsi_create_eqs() to detect the memory allocation error. This patch fixes the bug, assigning "-ENOMEM" to ret on the path that the call to pci_alloc_consistent() fails. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188951 Signed-off-by: Pan Bian --- drivers/scsi/be2iscsi/be_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index b6c5791..b5112d6 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -3049,8 +3049,10 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, eq_vaddress = pci_alloc_consistent(phba->pcidev, num_eq_pages * PAGE_SIZE, &paddr); - if (!eq_vaddress) + if (!eq_vaddress) { + ret = -ENOMEM; goto create_eq_error; + } mem->va = eq_vaddress; ret = be_fill_queue(eq, phba->params.num_eq_entries,