Message ID | 20230919232815.166772-1-surajjs@amazon.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 593F3CE79A9 for <linux-mm@archiver.kernel.org>; Tue, 19 Sep 2023 23:29:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D5BD86B00E9; Tue, 19 Sep 2023 19:28:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D0C2C6B00EA; Tue, 19 Sep 2023 19:28:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFA346B00EB; Tue, 19 Sep 2023 19:28:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B00636B00E9 for <linux-mm@kvack.org>; Tue, 19 Sep 2023 19:28:59 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6ED02A06AC for <linux-mm@kvack.org>; Tue, 19 Sep 2023 23:28:59 +0000 (UTC) X-FDA: 81254939598.06.994736D Received: from smtp-fw-80006.amazon.com (smtp-fw-80006.amazon.com [99.78.197.217]) by imf11.hostedemail.com (Postfix) with ESMTP id 2D0E040003 for <linux-mm@kvack.org>; Tue, 19 Sep 2023 23:28:56 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=fCXXvwaX; spf=pass (imf11.hostedemail.com: domain of "prvs=619a74f03=surajjs@amazon.com" designates 99.78.197.217 as permitted sender) smtp.mailfrom="prvs=619a74f03=surajjs@amazon.com"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695166137; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=N1uB7lsYbgFhpbI/u6XcPrZ41m9s6L1lr4JQrgc4zA4=; b=UhDBZaw9LZMzbO8AQl/44COXE7i5Jo1KhErKF763+WmR+edYmfqe0v2PV3lWXiquWDY64x kTpTRgIAAI9Pm92bIQxdFLpvSQDhgQZVbMlOCfgXM8rzi7cUPFLPai683ZvCiNg6akvcGV bVlSJ/KrQDLQEOzZFvND3M4IqT6of64= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695166137; a=rsa-sha256; cv=none; b=wHpPEYQoemaISeoqBiBSUnGuRYnrQSgO8gZEMXVj3kxRZokbPh/mhnIR5gFSPrnIELsZxB jotR+QYbRWxTUwT1PnPTQUYTJxG9BGmCbCyTPsD0YZe6G54U4ki7tBaBqPWHDTLrH3nIAm LwjfteQalT9tc0+RMel9EfzGpc+BaKo= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=fCXXvwaX; spf=pass (imf11.hostedemail.com: domain of "prvs=619a74f03=surajjs@amazon.com" designates 99.78.197.217 as permitted sender) smtp.mailfrom="prvs=619a74f03=surajjs@amazon.com"; dmarc=pass (policy=quarantine) header.from=amazon.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1695166138; x=1726702138; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=N1uB7lsYbgFhpbI/u6XcPrZ41m9s6L1lr4JQrgc4zA4=; b=fCXXvwaXs5lFcib84Et8I32X0D33wboa300X1UEL/SZyg3RZMmbF3GLk XyMCIR3dGALeGVisRvzqUb62RDcsm3Ra1NYJaSPN2XgTf0C4OfuR3WlP1 ULwq5CVGRoV5dilAHaa/+xzMGfYCPfAPCIYYp34+7OoVULVkh1gB4ZUQE Y=; X-IronPort-AV: E=Sophos;i="6.02,160,1688428800"; d="scan'208";a="239725023" Received: from pdx4-co-svc-p1-lb2-vlan3.amazon.com (HELO email-inbound-relay-pdx-2a-m6i4x-1197e3af.us-west-2.amazon.com) ([10.25.36.214]) by smtp-border-fw-80006.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Sep 2023 23:28:57 +0000 Received: from EX19MTAUWB002.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan3.pdx.amazon.com [10.236.137.198]) by email-inbound-relay-pdx-2a-m6i4x-1197e3af.us-west-2.amazon.com (Postfix) with ESMTPS id 874D7100F14; Tue, 19 Sep 2023 23:28:55 +0000 (UTC) Received: from EX19D030UWB002.ant.amazon.com (10.13.139.182) by EX19MTAUWB002.ant.amazon.com (10.250.64.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Tue, 19 Sep 2023 23:28:49 +0000 Received: from u1e958862c3245e.ant.amazon.com (10.88.167.207) by EX19D030UWB002.ant.amazon.com (10.13.139.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Tue, 19 Sep 2023 23:28:49 +0000 From: Suraj Jitindar Singh <surajjs@amazon.com> To: <stable@vger.kernel.org> CC: <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>, <kent.overstreet@gmail.com>, <axboe@kernel.dk>, <sjitindarsingh@gmail.com>, Linus Torvalds <torvalds@linux-foundation.org>, Suraj Jitindar Singh <surajjs@amazon.com> Subject: [PATCH stable 5.10.y] mm/filemap: fix infinite loop in generic_file_buffered_read() Date: Tue, 19 Sep 2023 16:28:15 -0700 Message-ID: <20230919232815.166772-1-surajjs@amazon.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.88.167.207] X-ClientProxiedBy: EX19D039UWA002.ant.amazon.com (10.13.139.32) To EX19D030UWB002.ant.amazon.com (10.13.139.182) X-Rspamd-Queue-Id: 2D0E040003 X-Rspam-User: X-Stat-Signature: m87sab8osxkwapkaptuhxc1st7g6oddm X-Rspamd-Server: rspam03 X-HE-Tag: 1695166136-642263 X-HE-Meta: U2FsdGVkX1+LDIfLLpmgJoMoEqbi6U1IFICFrfBfHa104n/DP5HstUStwoFSw2/2mAV4b4g940zObQGgX98JfDy639AULYi8JpRFR7UhebqTQwKmkiB4qklqeLWibdC5gVQp3JK3rsO5A/R/2QPopMrgTq6JmEdJpY5+1856HPrjCPT2aIWvBxsImKom5koC/K2vGzAEBMOjRS+rM/XyuDMM59+9azfULPGND3wagNQm38t4OtEkCnXJA0nQSB6v+jt0Funb2nQ4Gbl0WqxUvX127XS5RQC3kywHOYlQwzh/nrTlDVh+PXyN4DIoxbanikuJp6Yl0wM2tx7jklRmn2MD8xEvyhoOCexwQ/sOoRhAHvKLIPdfw8/FE+ukmZ7fvouzSVR3X3f140lEecFgMqnji0bzQJ+aQ21YccylOx/L1GStuYJ8YPR5wFd8kDECOUkJalzhWxZeie+tVvnPNP20fqXWKMbrZxJbHSPeIJ8NdrYJz0wMrrKopT6hDVpBS9cpezU8t0hw8Q31gDeELZUMHUr7PqW0cmruYanBbYDbLIGmxr810QCQOTg4tIIk5fHxpqUC/gjDnRWpSFBQef1EsCYVxpvnNSm0VH1koe/j6tqdQu1M/zst6wkmsIDENNQcxv19nauYYoA0wxxFSW7FajlcDVwb8hTZ05iqhPEezzHQqHx3U1hJFVbpjzreHEy6N4Za6f2TP9tixow8hHqLhgR5kagebkRA26jBkjO4Hi/5jJkzmk/D42FTZow9jm4R3xN6xho+gaeV4O8Al8afLQNk+n3hy3GhZalbix32MM/LMWSwvkcSqGOVS734yjTS3ICQzScKhv2fiGqU7oQ+XOBR/KGoO4/QxHobgVLm4G2fYrOkbOSgM2vViA8X+d25aCrRVC+HvBgqT6Spao6iLFnM7UHu1ociw7gkETtFv2BxUbfS1eKEUFskoJ2Lg61yBQ1fXkG4NIXm44D HU0AgBQI SxJhqzNXXHhHHtof3bXKsTw4XO++HBC8bswU6YnrEtJ1aUz22pmhjuu3pn2AFmTF+SLJTNdgCQVelGpsmhvDchs/g89Y2qktEFk6DdriV3g6t2cyX4v3Qg7kvlla7D6LM9+xm90Uw4gl9zimSw9+hqaqQEtVXDiGp+oFK1PE26N35MLtngsq7mly10q0dCdMZKkY6RjvwICM1crT9qUsA9fzPSwCcDG/4mSbwtx0opZ38aOMcYhVuhOHB6X0EqeKa99lfNn6SPeIjE11RGKHTHqMG8xc96wyByQfZqM90ufw7H6qWh2A2rMx4YrHjgJEt2R4sR0X2QUC8JRz40k8JlAzRhB8Eqdtec7iXaowrFBkUYplfekGhF8VSSprM4MK0PGDj42m2X8ACm6KYEj8W6SZxeCWikR/MaagcwsaY7ELNPfrTi8jCdSVnm9NIuzjhUCsrwUZeP6dPK+YncQcKqpS64gyaAzTiV721HiEgp2r9Q63LOZpaRWiYRyp1eXewcGCg9RcjJL9iNzVSGD5RayGqdUG9u53CDp5HljB5ANMIBZbDsEArD6HxLLJsZspgkAdzDQts/0b1Sm39pGg4RJgqDaiqWE1IsPMkG9QLBgM8TC8M1HhY561V1jirRD+bgDmWGgnHF/AFNj7zDP7veQaROJ/fWhSnvydOhLfF/3lFsbVqVpyTF1wGbOMEfjc5QNbcBW5V8IjN34c3tj+oHy31uQOnM4cpunMnApqlxqEp5I/upDUyt4CuK581gN3A060Vu+Bw20O8No0= 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: <linux-mm.kvack.org> |
Series |
[stable,5.10.y] mm/filemap: fix infinite loop in generic_file_buffered_read()
|
expand
|
diff --git a/mm/filemap.c b/mm/filemap.c index 3a983bc1a71c..3b0d8c6dd587 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2203,6 +2203,9 @@ ssize_t generic_file_buffered_read(struct kiocb *iocb, if (unlikely(*ppos >= inode->i_sb->s_maxbytes)) return 0; + if (unlikely(!iov_iter_count(iter))) + return 0; + iov_iter_truncate(iter, inode->i_sb->s_maxbytes); index = *ppos >> PAGE_SHIFT;