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=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 965F7C433ED for ; Mon, 26 Apr 2021 22:17:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 691DD613AE for ; Mon, 26 Apr 2021 22:17:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232161AbhDZWSP (ORCPT ); Mon, 26 Apr 2021 18:18:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:42402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232116AbhDZWSL (ORCPT ); Mon, 26 Apr 2021 18:18:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C8DE061009; Mon, 26 Apr 2021 22:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619475449; bh=ZkTO8awNTukHLk9VqklD7IV/aS8daeT3oHbCNCTlruU=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=tGeZmm5EISAkX2zu0COUMzxEJ48ZzogTHl+MeQEq7QGqv1YyambEOCALAMAePQQf5 G0DjczaE/HqOaQ9IhPkbBjfsRDMUm3W87ekpMw/LpHnXugv4v/EqZRQqBwQx5sSDmR WcOvU7DHQFwa3ytQE9iriTQso6Sj9qNTTwXleW5p6S4MShm41eqmHIVbvwYrHCh8hO gq0i8WEHCOt7I7PEjW0Rafeb8jswqx2ioAJEbSXZXRfuBuqw1yvcwgds5zm/FD0Oti mwdib8qqn/UnLtnnntGZsYoNW0YCsN9ovXQw4zcEELP1XxMS1jDMzQMAPOvPhsKMHT QVCM/neQJS2pw== Message-ID: <728b55601fa54449cd43a35195641c00fbe6c096.camel@kernel.org> Subject: Re: [PATCH v2] netfs: Miscellaneous fixes From: Jeff Layton To: David Howells , Matthew Wilcox Cc: linux-fsdevel@vger.kernel.org, Alexander Viro , linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, ceph-devel@vger.kernel.org, Marc Dionne , Mike Marshall , Linus Torvalds , linux-cachefs@redhat.com, Christoph Hellwig , v9fs-developer@lists.sourceforge.net, linux-mm@kvack.org, linux-afs@lists.infradead.org, Dave Wysochanski , Trond Myklebust , Anna Schumaker , Steve French , Dominique Martinet , linux-kernel@vger.kernel.org Date: Mon, 26 Apr 2021 18:17:26 -0400 In-Reply-To: <3737237.1619472003@warthog.procyon.org.uk> References: <20210426210939.GS235567@casper.infradead.org> <161918446704.3145707.14418606303992174310.stgit@warthog.procyon.org.uk> <3726642.1619471184@warthog.procyon.org.uk> <3737237.1619472003@warthog.procyon.org.uk> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.0 (3.40.0-1.fc34) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org On Mon, 2021-04-26 at 22:20 +0100, David Howells wrote: > Okay, how about the attached, then? > > David > --- > netfs: Miscellaneous fixes >      > > > > Fix some miscellaneous things in the new netfs lib[1]: > >  (1) The kerneldoc for netfs_readpage() shouldn't say netfs_page(). > >  (2) netfs_readpage() can get an integer overflow on 32-bit when it >      multiplies page_index(page) by PAGE_SIZE. It should use >      page_file_offset() instead. > >  (3) netfs_write_begin() should use page_offset() to avoid the same >      overflow. > > Note that netfs_readpage() needs to use page_file_offset() rather than > page_offset() as it may see swap-over-NFS. > > Reported-by: Matthew Wilcox > Signed-off-by: David Howells > Link: https://lore.kernel.org/r/161789062190.6155.12711584466338493050.stgit@warthog.procyon.org.uk/ [1] > --- >  fs/netfs/read_helper.c | 6 +++--- >  1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/fs/netfs/read_helper.c b/fs/netfs/read_helper.c > index 1d3b50c5db6d..193841d03de0 100644 > --- a/fs/netfs/read_helper.c > +++ b/fs/netfs/read_helper.c > @@ -933,7 +933,7 @@ void netfs_readahead(struct readahead_control *ractl, >  EXPORT_SYMBOL(netfs_readahead); >   > > > >  /** > - * netfs_page - Helper to manage a readpage request > + * netfs_readpage - Helper to manage a readpage request >   * @file: The file to read from >   * @page: The page to read >   * @ops: The network filesystem's operations for the helper to use > @@ -968,7 +968,7 @@ int netfs_readpage(struct file *file, >   return -ENOMEM; >   } >   rreq->mapping = page_file_mapping(page); > - rreq->start = page_index(page) * PAGE_SIZE; > + rreq->start = page_file_offset(page); >   rreq->len = thp_size(page); >   > > > >   if (ops->begin_cache_operation) { > @@ -1106,7 +1106,7 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, >   if (!rreq) >   goto error; >   rreq->mapping = page->mapping; > - rreq->start = page->index * PAGE_SIZE; > + rreq->start = page_offset(page); >   rreq->len = thp_size(page); >   rreq->no_unlock_page = page->index; >   __set_bit(NETFS_RREQ_NO_UNLOCK_PAGE, &rreq->flags); > Reviewed-by: Jeff Layton 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=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 06C82C433B4 for ; Mon, 26 Apr 2021 22:17:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8432B60FDC for ; Mon, 26 Apr 2021 22:17:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8432B60FDC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E7F4C6B0036; Mon, 26 Apr 2021 18:17:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E2E776B006E; Mon, 26 Apr 2021 18:17:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CCEBB6B0070; Mon, 26 Apr 2021 18:17:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0040.hostedemail.com [216.40.44.40]) by kanga.kvack.org (Postfix) with ESMTP id B1ADD6B0036 for ; Mon, 26 Apr 2021 18:17:32 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 67AD4180AD83B for ; Mon, 26 Apr 2021 22:17:32 +0000 (UTC) X-FDA: 78075930744.29.1BE523B Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf04.hostedemail.com (Postfix) with ESMTP id 951033C2 for ; Mon, 26 Apr 2021 22:17:28 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id C8DE061009; Mon, 26 Apr 2021 22:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619475449; bh=ZkTO8awNTukHLk9VqklD7IV/aS8daeT3oHbCNCTlruU=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=tGeZmm5EISAkX2zu0COUMzxEJ48ZzogTHl+MeQEq7QGqv1YyambEOCALAMAePQQf5 G0DjczaE/HqOaQ9IhPkbBjfsRDMUm3W87ekpMw/LpHnXugv4v/EqZRQqBwQx5sSDmR WcOvU7DHQFwa3ytQE9iriTQso6Sj9qNTTwXleW5p6S4MShm41eqmHIVbvwYrHCh8hO gq0i8WEHCOt7I7PEjW0Rafeb8jswqx2ioAJEbSXZXRfuBuqw1yvcwgds5zm/FD0Oti mwdib8qqn/UnLtnnntGZsYoNW0YCsN9ovXQw4zcEELP1XxMS1jDMzQMAPOvPhsKMHT QVCM/neQJS2pw== Message-ID: <728b55601fa54449cd43a35195641c00fbe6c096.camel@kernel.org> Subject: Re: [PATCH v2] netfs: Miscellaneous fixes From: Jeff Layton To: David Howells , Matthew Wilcox Cc: linux-fsdevel@vger.kernel.org, Alexander Viro , linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, ceph-devel@vger.kernel.org, Marc Dionne , Mike Marshall , Linus Torvalds , linux-cachefs@redhat.com, Christoph Hellwig , v9fs-developer@lists.sourceforge.net, linux-mm@kvack.org, linux-afs@lists.infradead.org, Dave Wysochanski , Trond Myklebust , Anna Schumaker , Steve French , Dominique Martinet , linux-kernel@vger.kernel.org Date: Mon, 26 Apr 2021 18:17:26 -0400 In-Reply-To: <3737237.1619472003@warthog.procyon.org.uk> References: <20210426210939.GS235567@casper.infradead.org> <161918446704.3145707.14418606303992174310.stgit@warthog.procyon.org.uk> <3726642.1619471184@warthog.procyon.org.uk> <3737237.1619472003@warthog.procyon.org.uk> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.0 (3.40.0-1.fc34) MIME-Version: 1.0 X-Rspamd-Queue-Id: 951033C2 X-Stat-Signature: u9ks597n4f7y1gpjer5ig5h1cxnhu78z X-Rspamd-Server: rspam02 Received-SPF: none (kernel.org>: No applicable sender policy available) receiver=imf04; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619475448-400111 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, 2021-04-26 at 22:20 +0100, David Howells wrote: > Okay, how about the attached, then? >=20 > David > --- > netfs: Miscellaneous fixes > =C2=A0=C2=A0=C2=A0=C2=A0 >=20 >=20 >=20 > Fix some miscellaneous things in the new netfs lib[1]: >=20 > =C2=A0(1) The kerneldoc for netfs_readpage() shouldn't say netfs_page()= . >=20 > =C2=A0(2) netfs_readpage() can get an integer overflow on 32-bit when i= t > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0multiplies page_index(page) by PAGE_SIZE.= It should use > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0page_file_offset() instead. >=20 > =C2=A0(3) netfs_write_begin() should use page_offset() to avoid the sam= e > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0overflow. >=20 > Note that netfs_readpage() needs to use page_file_offset() rather than > page_offset() as it may see swap-over-NFS. >=20 > Reported-by: Matthew Wilcox > Signed-off-by: David Howells > Link: https://lore.kernel.org/r/161789062190.6155.12711584466338493050.= stgit@warthog.procyon.org.uk/ [1] > --- > =C2=A0fs/netfs/read_helper.c | 6 +++--- > =C2=A01 file changed, 3 insertions(+), 3 deletions(-) >=20 > diff --git a/fs/netfs/read_helper.c b/fs/netfs/read_helper.c > index 1d3b50c5db6d..193841d03de0 100644 > --- a/fs/netfs/read_helper.c > +++ b/fs/netfs/read_helper.c > @@ -933,7 +933,7 @@ void netfs_readahead(struct readahead_control *ract= l, > =C2=A0EXPORT_SYMBOL(netfs_readahead); > =C2=A0 >=20 >=20 >=20 > =C2=A0/** > - * netfs_page - Helper to manage a readpage request > + * netfs_readpage - Helper to manage a readpage request > =C2=A0=C2=A0* @file: The file to read from > =C2=A0=C2=A0* @page: The page to read > =C2=A0=C2=A0* @ops: The network filesystem's operations for the helper = to use > @@ -968,7 +968,7 @@ int netfs_readpage(struct file *file, > =C2=A0 return -ENOMEM; > =C2=A0 } > =C2=A0 rreq->mapping =3D page_file_mapping(page); > - rreq->start =3D page_index(page) * PAGE_SIZE; > + rreq->start =3D page_file_offset(page); > =C2=A0 rreq->len =3D thp_size(page); > =C2=A0 >=20 >=20 >=20 > =C2=A0 if (ops->begin_cache_operation) { > @@ -1106,7 +1106,7 @@ int netfs_write_begin(struct file *file, struct a= ddress_space *mapping, > =C2=A0 if (!rreq) > =C2=A0 goto error; > =C2=A0 rreq->mapping =3D page->mapping; > - rreq->start =3D page->index * PAGE_SIZE; > + rreq->start =3D page_offset(page); > =C2=A0 rreq->len =3D thp_size(page); > =C2=A0 rreq->no_unlock_page =3D page->index; > =C2=A0 __set_bit(NETFS_RREQ_NO_UNLOCK_PAGE, &rreq->flags); >=20 Reviewed-by: Jeff Layton