From patchwork Sat May 20 00:00:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 96677 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp40825vqo; Fri, 19 May 2023 17:03:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5/RCLlMo8uqmtppr5dH2rBpMRIeKVYat2DXWfDy5zu6Ok94P4vaDnosL/gHSxapo7I1ULi X-Received: by 2002:a05:6a00:1a15:b0:64d:88b:a342 with SMTP id g21-20020a056a001a1500b0064d088ba342mr4484361pfv.30.1684540988310; Fri, 19 May 2023 17:03:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684540988; cv=none; d=google.com; s=arc-20160816; b=A/BDlMZ2n4perU1jmHRLfU4FWl59MQbOH5uIiPM655+85x0p2y8jR5S1+Iw105TnuB IYO/MnkBywdp04hUawWEXu7vt/wVQ8QgeG11fUgXuccgOjLDD+Nf+2RZoJg5TuwDX4cn 1GlGEmdN+LHTEIEVOeh0Zwx6HGYgN+EV5gn4PWg11InkvNXAlTDhah2v0rcW7gdE1sk5 JKl2eRN9BqJC1vV8Rsu2tcGnrqUosriMwsluxvPlPvTCreIz2JoWDAedOQVrVF8UcHZa bpNjFs82JWUNhyybqHIsNzY4r1in72lTYOd1dPCwwBeylg8XR9JIIV4pmnQnA3OGrRXM ZJXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nJaiYO7hPfGCITlMv/e2fYDm8/jpubbHDQ4RMy5/oPM=; b=wL7cvVehr4MU+uqF9HqiZozS8VjvL6vkwRaUAYy8T1VMjd2H/Rfs2X8++qq6wGKExB vz/Ru0/BNHnCl/Enkw8ar3uN3xJiCkdscVoWDNUD1a96Ojlsmp/1qxg8/JXUuuB0pd/L OrI7Y7feGRtl36VPfACAeQxUN/rg15byfhWMntRAuU8k34YlQE7bAk6+plBX17jvytKu NGoXBinoF/k8C3dDAEv80B1/Pv3Ts7g3dxyVQg854FUIHc9H6LLhY3rTjyutXN3jzJF1 jO/4vjp3fOzvv59dZzh345FFVIJ8Sh+LkcwHmpesYEhL/y1c6qjD6D/niN95FET4RNV9 HXkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WiUNMA7W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g9-20020a63fa49000000b0052c5d8db0ddsi417664pgk.790.2023.05.19.17.02.56; Fri, 19 May 2023 17:03:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WiUNMA7W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229807AbjETACd (ORCPT + 99 others); Fri, 19 May 2023 20:02:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbjETAC2 (ORCPT ); Fri, 19 May 2023 20:02:28 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03382E5A for ; Fri, 19 May 2023 17:01:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684540865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nJaiYO7hPfGCITlMv/e2fYDm8/jpubbHDQ4RMy5/oPM=; b=WiUNMA7WzmcQfFH2XU0GCvIHvKNRWVZHTvnCtcw59LHAoJ8n8+9YUV+PKADiBki1Oz6RB5 e17jzhnVWnP8ZGh1Yz1so9qNv6sI7BrAmAdzC6vUZ5RrCUJWZYSWR1FgHfpC6qPTS3S/s2 YR3K+fD3bnijhwtA/iUiTQAVSBvjeQE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-530-gdX8HUEaPSKe1E3KxEDqow-1; Fri, 19 May 2023 20:01:00 -0400 X-MC-Unique: gdX8HUEaPSKe1E3KxEDqow-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C53B1185A78E; Sat, 20 May 2023 00:00:59 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B5751121314; Sat, 20 May 2023 00:00:57 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , Christian Brauner , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , Steve French , John Hubbard Subject: [PATCH v21 02/30] splice: Make filemap_splice_read() check s_maxbytes Date: Sat, 20 May 2023 01:00:21 +0100 Message-Id: <20230520000049.2226926-3-dhowells@redhat.com> In-Reply-To: <20230520000049.2226926-1-dhowells@redhat.com> References: <20230520000049.2226926-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766369251407565123?= X-GMAIL-MSGID: =?utf-8?q?1766369251407565123?= Make filemap_splice_read() check s_maxbytes analogously to filemap_read(). Signed-off-by: David Howells cc: Christoph Hellwig cc: Steve French cc: Jens Axboe cc: Al Viro cc: David Hildenbrand cc: John Hubbard cc: linux-mm@kvack.org cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org Reviewed-by: Christoph Hellwig Reviewed-by: Christian Brauner --- mm/filemap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/filemap.c b/mm/filemap.c index a2006936a6ae..0fcb0b80c2e2 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2887,6 +2887,9 @@ ssize_t filemap_splice_read(struct file *in, loff_t *ppos, bool writably_mapped; int i, error = 0; + if (unlikely(*ppos >= in->f_mapping->host->i_sb->s_maxbytes)) + return 0; + init_sync_kiocb(&iocb, in); iocb.ki_pos = *ppos;