From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795023701; b=Vufwh2Qm40wTht7SXZsY2Pe6kpn9f053ENIhB5l0Y1zaJTilrhswpgH7BdR2MCBxG0t2 WMn97Szo85GlwGpzaC17qbMf28XwCumEJrH3JsSYz1Csq4uUJGorgpgTNHFoFpCN84OJG ujXWuDhpMWfHY8hZTy0mQ8f9sU+0MQWnceHPKvKzSEhu1Y5jyy+8y97lrNvMyMMU+Ucbn 4yfDtOtf9T/JCnIZ+5c2bP6ViYbcM/ae54VOcsSSxEHOj9nslAm8Z/7NOxir2PhsgGfRe C2vKs6FA+/2fB6FWmL151OAcRr4SfuZlkCvqSi9xjSxUed6a4kMAlNqrWbrzC4v4mXQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023701; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Oim+jCpdKoelYTUWqWkRpRoMWNx6tjvnFE8TXmtLT/M=; b=gafszXKIIOgiIWEIMxDi6rwm1IpC+5kne9I6hv0LAabKyy6UakOHlsWk9YzGT2tWpaSb J1AZ6Zvg4WGlt5SIqSTg/DThMpPRycHsnJptPkGNe8J+yfNxChl6NonuS/eDRsDAawssN LaFtsSaGEn+0nt/bAV3SgdxZC0ujT3xyLJt8Lr6Zb8E03W6udYUmEDYt+z7MR+1d5UQuL ASpv5QRk65pG54/ce07ASHaTZTuw7JWWO2kdlHNz0OrMp5M8q+zU2ZnntMNQkeL6KpUCG iOZTTBeuWsJ9hQOeUbjcff3wFATtNcM5TrOL2O1kV3G8VK1czvmGgYu4m2utgoPdm0Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=fIPIMWzN; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B696606A31C; Wed, 18 Nov 2026 17:41:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=fIPIMWzN Received: by smtp.kernel.org (Postfix) with ESMTPSA id A979F1F000C4; Wed, 18 Nov 2026 17:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023701; bh=Oim+jCpdKoelYTUWqWkRpRoMWNx6tjvnFE8TXmtLT/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fIPIMWzNLtvpxqKLl+nADO9z4NiK6QGjOROky6FXbt0TBr7jOrcTm+1JS5m5X4Oy9 yLNUNXcYhC6HWcKX99MRdcWG0X1gL93MzxpSrND9YUV/wkkVRo43E/GWrDuDzqi8Io EXFaJyDdBeQRRDr35CiHDPbIxhI0nvK1WBr3fKfY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Kiryl Shutsemau (Meta)" , Sarthak Sharma , "David Hildenbrand (Arm)" , Sasha Levin Subject: [PATCH 6.18 0462/2151] mm/gup_test: safely calculate GUP batch size Date: Wed, 18 Nov 2026 15:36:37 +0100 Message-ID: <20261118150138.850907092@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sarthak Sharma [ Upstream commit 44817a536aaa5bfac0d316242e93e489d0a69d5f ] __gup_test_ioctl() calculates the end of a GUP batch using: next = addr + nr * PAGE_SIZE; If nr is too large, it can cause next to overflow and wrap around. If it wraps, the next > end check is bypassed and a large value of nr is passed to the GUP call, even though the pages array was allocated according to gup->size. This can lead to out of bounds writes. Also, when fewer than PAGE_SIZE bytes remain, the calculated batch contains zero pages. The code still calls GUP functions with pages + i, which can point past the allocated array. Calculate nr by taking the minimum of the number of pages per call and the pages remaining in the address range. Reject zero sized and non page aligned gup->size values and zero nr_pages_per_call value. Fixes: 64c349f4ae78 ("mm: add infrastructure for get_user_pages_fast() benchmarking") Reviewed-by: Kiryl Shutsemau (Meta) Signed-off-by: Sarthak Sharma Link: https://patch.msgid.link/20260915102524.125758-1-sarthak.sharma@arm.com Signed-off-by: David Hildenbrand (Arm) Signed-off-by: Sasha Levin --- mm/gup_test.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/gup_test.c b/mm/gup_test.c index c9e7c1cf5b080..6de8064090ea1 100644 --- a/mm/gup_test.c +++ b/mm/gup_test.c @@ -109,7 +109,8 @@ static int __gup_test_ioctl(unsigned int cmd, bool needs_mmap_lock = cmd != GUP_FAST_BENCHMARK && cmd != PIN_FAST_BENCHMARK; - if (gup->addr > ULONG_MAX || gup->size > ULONG_MAX) + if (gup->addr > ULONG_MAX || gup->size > ULONG_MAX || !gup->size || + !gup->nr_pages_per_call || !PAGE_ALIGNED(gup->size)) return -EINVAL; if (check_add_overflow((unsigned long)gup->addr, (unsigned long)gup->size, &end)) @@ -132,11 +133,9 @@ static int __gup_test_ioctl(unsigned int cmd, if (nr != gup->nr_pages_per_call) break; + nr = min_t(unsigned long, nr, (end - addr) / PAGE_SIZE); + next = addr + nr * PAGE_SIZE; - if (next > end) { - next = end; - nr = (next - addr) / PAGE_SIZE; - } switch (cmd) { case GUP_FAST_BENCHMARK: -- 2.53.0