From patchwork Wed Mar 25 06:53:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Bo X-Patchwork-Id: 11457051 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7073E161F for ; Wed, 25 Mar 2020 06:53:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A89F2074D for ; Wed, 25 Mar 2020 06:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725939AbgCYGxq convert rfc822-to-8bit (ORCPT ); Wed, 25 Mar 2020 02:53:46 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:3046 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725781AbgCYGxq (ORCPT ); Wed, 25 Mar 2020 02:53:46 -0400 Received: from dggeml405-hub.china.huawei.com (unknown [172.30.72.53]) by Forcepoint Email with ESMTP id 4E5993D907617DFDD781; Wed, 25 Mar 2020 14:53:33 +0800 (CST) Received: from DGGEML423-HUB.china.huawei.com (10.1.199.40) by dggeml405-hub.china.huawei.com (10.3.17.49) with Microsoft SMTP Server (TLS) id 14.3.487.0; Wed, 25 Mar 2020 14:53:33 +0800 Received: from DGGEML525-MBS.china.huawei.com ([169.254.4.199]) by dggeml423-hub.china.huawei.com ([10.1.199.40]) with mapi id 14.03.0487.000; Wed, 25 Mar 2020 14:53:26 +0800 From: "wubo (T)" To: Lee Duncan , Chris Leech , "James E.J. Bottomley" , "Martin K. Petersen" , "linux-scsi@vger.kernel.org" , "open-iscsi@googlegroups.com" , "linux-kernel@vger.kernel.org" CC: linfeilong , "liuzhiqiang (I)" Subject: [PATCH] scsi:libiscsi:Fix an error count for active session Thread-Topic: [PATCH] scsi:libiscsi:Fix an error count for active session Thread-Index: AdYCcb2iexxjeQOuRpOqeUuVmQcdfw== Date: Wed, 25 Mar 2020 06:53:25 +0000 Message-ID: Accept-Language: en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.173.221.252] MIME-Version: 1.0 X-CFilter-Loop: Reflected Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Wu Bo Fix an error count for active session if the total_cmds is invalid on the function iscsi_session_setup(). decrement the number of active sessions before the func return. Signed-off-by: Wu Bo Reviewed-by: Lee Duncan --- drivers/scsi/libiscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.1 diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 70b99c0..b7158eb 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -2771,7 +2771,7 @@ struct iscsi_cls_session * "must be a power of 2.\n", total_cmds); total_cmds = rounddown_pow_of_two(total_cmds); if (total_cmds < ISCSI_TOTAL_CMDS_MIN) - return NULL; + goto dec_session_count; printk(KERN_INFO "iscsi: Rounding can_queue to %d.\n", total_cmds); }