Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753560AbdC1Elk (ORCPT ); Tue, 28 Mar 2017 00:41:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57408 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750707AbdC1Eli (ORCPT ); Tue, 28 Mar 2017 00:41:38 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7058580F8E Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7058580F8E From: Fam Zheng To: linux-kernel@vger.kernel.org Cc: "Martin K. Petersen" , famz@redhat.com, linux-scsi@vger.kernel.org, Laurence Oberman , "James E.J. Bottomley" Subject: [PATCH v2] sd: Consider max_xfer_blocks if opt_xfer_blocks is unusable Date: Tue, 28 Mar 2017 12:41:26 +0800 Message-Id: <20170328044126.10006-1-famz@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 28 Mar 2017 04:41:32 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 871 Lines: 28 If device reports a small max_xfer_blocks and a zero opt_xfer_blocks, we end up using BLK_DEF_MAX_SECTORS, which is wrong and r/w of that size may get error. Fixes: ca369d51b3e ("block/sd: Fix device-imposed transfer length limits") Signed-off-by: Fam Zheng --- v2: Fix granularity mismatch. [Martin] --- drivers/scsi/sd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index fcfeddc..a5c7e67 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2957,6 +2957,7 @@ static int sd_revalidate_disk(struct gendisk *disk) rw_max = logical_to_sectors(sdp, sdkp->opt_xfer_blocks); } else rw_max = BLK_DEF_MAX_SECTORS; + rw_max = min_not_zero(rw_max, logical_to_sectors(sdp, dev_max)); /* Combine with controller limits */ q->limits.max_sectors = min(rw_max, queue_max_hw_sectors(q)); -- 2.9.3