From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A3ADC433FE for ; Tue, 19 Apr 2022 18:15:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349089AbiDSSRu (ORCPT ); Tue, 19 Apr 2022 14:17:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356531AbiDSSQY (ORCPT ); Tue, 19 Apr 2022 14:16:24 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B05763EBA0; Tue, 19 Apr 2022 11:12:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 629F2B81982; Tue, 19 Apr 2022 18:12:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C489C385A9; Tue, 19 Apr 2022 18:12:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650391958; bh=MK0OE6TjYTtxohqk28sr/Dd7rzK97V5i8xMRJVD6TPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SF4PrCXLyzxyYaFNiTpbcNpaOt1BOLXb7LQ9iSbrLGUPsWBqkQW1aXy6DNqknTaMc /eLRPkxZUt6PR8VmwMlN3VYHHY/7fFTfOTYeK3ekg9EYlU48VytfcNJDALR7JHJg4+ 7YgxkxYOcOHih7RdtDrBuDJD4cGWDqywbe1uCMO6WprfDMpwBsUJJ8FigfKCNG/STi p4Ci+qkZJct2pU+ef9WbTlEIcZ6e99FTR6JgN+p4vmDo6WkWM2M85HGyx44hXwwwOO roCHq95KI2q6SUFphlUgnLGUythIKDWCPZXowl79y9578erU5+FttRAfrnkce4TlUK JoFlbnZZGH3Ig== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Khazhismel Kumykov , Bart Van Assche , Chaitanya Kulkarni , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 33/34] block/compat_ioctl: fix range check in BLKGETSIZE Date: Tue, 19 Apr 2022 14:11:00 -0400 Message-Id: <20220419181104.484667-33-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419181104.484667-1-sashal@kernel.org> References: <20220419181104.484667-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Khazhismel Kumykov [ Upstream commit ccf16413e520164eb718cf8b22a30438da80ff23 ] kernel ulong and compat_ulong_t may not be same width. Use type directly to eliminate mismatches. This would result in truncation rather than EFBIG for 32bit mode for large disks. Reviewed-by: Bart Van Assche Signed-off-by: Khazhismel Kumykov Reviewed-by: Chaitanya Kulkarni Link: https://lore.kernel.org/r/20220414224056.2875681-1-khazhy@google.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/ioctl.c b/block/ioctl.c index 4a86340133e4..f8703db99c73 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -629,7 +629,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) return compat_put_long(argp, (bdev->bd_disk->bdi->ra_pages * PAGE_SIZE) / 512); case BLKGETSIZE: - if (bdev_nr_sectors(bdev) > ~0UL) + if (bdev_nr_sectors(bdev) > ~(compat_ulong_t)0) return -EFBIG; return compat_put_ulong(argp, bdev_nr_sectors(bdev)); -- 2.35.1