From patchwork Thu Oct 11 07:09:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 10636163 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D013A3CF1 for ; Thu, 11 Oct 2018 07:09:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8D5A2AE79 for ; Thu, 11 Oct 2018 07:09:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD9292AEFF; Thu, 11 Oct 2018 07:09:59 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 4F9732AE79 for ; Thu, 11 Oct 2018 07:09:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725995AbeJKOfy (ORCPT ); Thu, 11 Oct 2018 10:35:54 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:12787 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726781AbeJKOfy (ORCPT ); Thu, 11 Oct 2018 10:35:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1539241798; x=1570777798; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=RhE+4eQvysMh/NWAQ/rNU/a+nQVPVKOqVq45ZCS4sRw=; b=BmiUrdfW19jPTiL1gncif5IfI/8bALvXSgZSfgfByNsYcGRnbBB3/AIC WBrqcjx9+m9Cq1XaHJaQxLRjKFSUkIHOEYH1fBEyaGyOzq5CpUPfmLb1k twjx3p77Fmf6ru6iqUu1HyhTPAO5NocxBUV1ALWhVloltsTvE1XpXagmX pNi9zOMSXJbvjDQrHm/VGxAccztODBoMY0wWNqIeraZ8GaH523riGJ6Gc A9HcwaTLD8orsuevHrCitQjX9Hq86OHtsp5Pxb+STeuz3C2gVynfl2V0v F0vIWYS8aU5z0sLCvFnfGtUVvLGiI5yn2Q3txyGYjf4qyVrwlSPdhz5Zw g==; X-IronPort-AV: E=Sophos;i="5.54,367,1534780800"; d="scan'208";a="196047557" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 11 Oct 2018 15:09:58 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 10 Oct 2018 23:54:56 -0700 Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip02.wdc.com with ESMTP; 11 Oct 2018 00:09:58 -0700 From: Damien Le Moal To: linux-block@vger.kernel.org, Jens Axboe , linux-scsi@vger.kernel.org, "Martin K . Petersen" , dm-devel@redhat.com, Mike Snitzer Cc: Christoph Hellwig , Matias Bjorling Subject: [PATCH v2 03/11] scsi: sd_zbc: Fix sd_zbc_check_zones() error checks Date: Thu, 11 Oct 2018 16:09:44 +0900 Message-Id: <20181011070952.13248-4-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181011070952.13248-1-damien.lemoal@wdc.com> References: <20181011070952.13248-1-damien.lemoal@wdc.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The 32 bits overflow check for the zone size value is already done within sd_zbc_check_zones() with the test: } else if (logical_to_sectors(sdkp->device, zone_blocks) > UINT_MAX) { so there is no need to check again for an out of range value in sd_zbc_read_zones(). Simplify the code and fix sd_zbc_check_zones() error return to -EFBIG instead of -ENODEV if the zone size is too large. Signed-off-by: Damien Le Moal Reviewed-by: Christoph Hellwig --- drivers/scsi/sd_zbc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index ca73c46931c0..44b64b4a922a 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -373,7 +373,7 @@ static int sd_zbc_check_zoned_characteristics(struct scsi_disk *sdkp, * Returns the zone size in number of blocks upon success or an error code * upon failure. */ -static s64 sd_zbc_check_zones(struct scsi_disk *sdkp) +static s32 sd_zbc_check_zones(struct scsi_disk *sdkp) { u64 zone_blocks = 0; sector_t max_lba, block = 0; @@ -472,7 +472,7 @@ static s64 sd_zbc_check_zones(struct scsi_disk *sdkp) if (sdkp->first_scan) sd_printk(KERN_NOTICE, sdkp, "Zone size too large\n"); - ret = -ENODEV; + ret = -EFBIG; } else { ret = zone_blocks; } @@ -668,8 +668,7 @@ static int sd_zbc_setup(struct scsi_disk *sdkp, u32 zone_blocks) int sd_zbc_read_zones(struct scsi_disk *sdkp, unsigned char *buf) { - int64_t zone_blocks; - int ret; + int ret, zone_blocks; if (!sd_is_zoned(sdkp)) /* @@ -688,12 +687,10 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, unsigned char *buf) * an eventual last runt zone) that is a power of 2 are supported. */ zone_blocks = sd_zbc_check_zones(sdkp); - ret = -EFBIG; - if (zone_blocks != (u32)zone_blocks) - goto err; - ret = zone_blocks; - if (ret < 0) + if (zone_blocks < 0) { + ret = zone_blocks; goto err; + } /* The drive satisfies the kernel restrictions: set it up */ ret = sd_zbc_setup(sdkp, zone_blocks);