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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24B6CC56202 for ; Mon, 26 Oct 2020 16:46:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9DBE5221FC for ; Mon, 26 Oct 2020 16:46:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="f1NI3CAs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1780583AbgJZQq2 (ORCPT ); Mon, 26 Oct 2020 12:46:28 -0400 Received: from casper.infradead.org ([90.155.50.34]:45024 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408380AbgJZQot (ORCPT ); Mon, 26 Oct 2020 12:44:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:To:From:Date:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description; bh=ulnqTjMrBKaF480Abr2+mk3fNXPi753tTvCmHg1d4pg=; b=f1NI3CAsOSysuZzKkwfJhVuIWR 3mXIQtiVD7DD/2SdiUrYbTpuJuX6lgF28b/95rFLxUerMdwSVmj/ZV+tnAz6dfDbVkSdMl8QQJJ3n rpRsqBFIv8JAhq+bzsja5A3WUI151bKwWdqER6/6DpsxpQ5cju9L+9HnwftwJrMUJsnBY7ZyiSaZE 8qIFt38vcTDLCQX9rCsElOM2Ls24D0mI6Qa8Th4tgk+hFQHG+OuASqdjaqYMzYmn28LiHoaDg4WOl jNsaZjcAxkuv+tE9b6PitSKZTpk4b1W73VyFNGg8Te+nIR/QvFEqofI+P0lH20xmNgUMLOXbB4jLN dNv1gxow==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX5bu-0003Lt-GL; Mon, 26 Oct 2020 16:44:42 +0000 Date: Mon, 26 Oct 2020 16:44:42 +0000 From: Matthew Wilcox To: dsterba@suse.cz, linux-fsdevel@vger.kernel.org, ericvh@gmail.com, lucho@ionkov.net, viro@zeniv.linux.org.uk, jlayton@kernel.org, idryomov@gmail.com, mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com, v9fs-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org, ceph-devel@vger.kernel.org, ocfs2-devel@oss.oracle.com, linux-btrfs@vger.kernel.org, clm@fb.com, josef@toxicpanda.com, dsterba@suse.com, stable@vger.kernel.org Subject: Re: [PATCH 6/7] btrfs: Promote to unsigned long long before shifting Message-ID: <20201026164442.GU20115@casper.infradead.org> References: <20201004180428.14494-1-willy@infradead.org> <20201004180428.14494-7-willy@infradead.org> <20201026163546.GP6756@twin.jikos.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201026163546.GP6756@twin.jikos.cz> Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Archived-At: List-Archive: List-Post: On Mon, Oct 26, 2020 at 05:35:46PM +0100, David Sterba wrote: > On Sun, Oct 04, 2020 at 07:04:27PM +0100, Matthew Wilcox (Oracle) wrote: > > On 32-bit systems, this shift will overflow for files larger than 4GB. > > > > Cc: stable@vger.kernel.org > > Fixes: 53b381b3abeb ("Btrfs: RAID5 and RAID6") > > Signed-off-by: Matthew Wilcox (Oracle) > > --- > > fs/btrfs/raid56.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c > > index 255490f42b5d..5ee0a53301bd 100644 > > --- a/fs/btrfs/raid56.c > > +++ b/fs/btrfs/raid56.c > > @@ -1089,7 +1089,7 @@ static int rbio_add_io_page(struct btrfs_raid_bio *rbio, > > u64 disk_start; > > > > stripe = &rbio->bbio->stripes[stripe_nr]; > > - disk_start = stripe->physical + (page_index << PAGE_SHIFT); > > + disk_start = stripe->physical + ((loff_t)page_index << PAGE_SHIFT); > > It seems that this patch is mechanical replacement. If you check the > callers, the page_index is passed from an int that iterates over bits > set in an unsigned long (bitmap). The result won't overflow. Not mechanical, but I clearly made mistakes. Will you pick up the patches which actually fix bugs?