From patchwork Tue Aug 25 15:55:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Alice C. Munduruca" X-Patchwork-Id: 2291929 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4hTsnY37l4z1xxf for ; Wed, 26 Aug 2026 01:55:45 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1wytUw-0002Ob-NY; Tue, 25 Aug 2026 15:55:38 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1wytUv-0002NC-Dy for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2026 15:55:37 +0000 Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4A3923F1C7 for ; Tue, 25 Aug 2026 15:55:37 +0000 (UTC) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-90a60102d6eso36948556d6.3 for ; Tue, 25 Aug 2026 08:55:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787673336; x=1788278136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=3rw5rdtEfqeXvZ6i3kZRrOSToYOvrVpftRR/qnIE7Mo=; b=jDcAkkFDrV56+NaWdDpLUUJsj7u3rQIPwlpKvBykB89sWYTJheCVdeQRtFQIFqMPd6 wrscAfgVh2Q4UWxmO6jY5WpJV9xSeP2p7mShohoBgKTBfHhZHG1Fcfbf9djozJ+Rgi1P fakiQxoVt2EgwB+vmCAC4j1eB5LNoKbGzlfDQCC4Gh/iEm6Euhuifw2kWq1vlN+/R7hN tKzx03w5JEcAJKmz5h7RAOWXO+MDt6JZj9Y7PXWC6YTex2UtvcH9jHzioxr61kr1b9zt 96V4nyVfzmJ+YC2Iw7MUwiRcuX9vyPrAimAs1IZi1r3bsQkUo3YSEG2g8Opa6BjzQTrQ kmqA== X-Gm-Message-State: AFuF++m2yOgbwkrF2nKSv9kzCVCNsx4AynkvsK0IOKWcL9QnNb7wooi+ MGUKnJK0FW9J+fAA/AoQ1wnyG/qy1Q4ghNgq0skaV7fgageUSba02pW2Hz3KyFJbU5JXNOzgrpx lNG/kdZu2Iu07QjUCm3qP0ap3emJtTyvu2j/YNthpbKMDwVlnA63zjeSrpT2IMaMw3eDHNdvWKY N0oiWwrOZ6amBbeQ== X-Gm-Gg: AR+sD11+gnkXw+DjCzxXe41M1JKEOMd7ufN+68P/KcGEeL1QdG5daUjn9H2bZwwMR7k 9nvEExBq4PsHQxvlTrje6iRH1ATghWTbxR6PaBLefqFQYpA/s2Cvflkv6gGu3OckZEYtcq5cUOD 0O1vg2FMLuPk58qP/N62nZvqOXucO3xNmLVq4MlMmeN9hVE69+K6EVkeuJkPvN6YjS9zXT/biZD JQhgT6JWUlBcCKd8/iDcbYrkYRnUBdMKiakORQ0HECj1d1cvqVyVSSrik6GMOBgVXKUp2eZQIkZ 4fjCoWdV26AR8TQbXyRTOx2sPwp4TlhYJups2zpE7kkalu+tm6sdEkwALNbuZMPKLcmYk83zS6k 9ffNTpwTl X-Received: by 2002:a05:6214:268a:b0:90c:b843:d679 with SMTP id 6a1803df08f44-90cb843d94cmr70583656d6.29.1787673335809; Tue, 25 Aug 2026 08:55:35 -0700 (PDT) X-Received: by 2002:a05:6214:268a:b0:90c:b843:d679 with SMTP id 6a1803df08f44-90cb843d94cmr70583086d6.29.1787673335451; Tue, 25 Aug 2026 08:55:35 -0700 (PDT) Received: from localhost ([70.24.127.164]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-90cc65448f5sm1468946d6.45.2026.08.25.08.55.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 08:55:34 -0700 (PDT) To: kernel-team@lists.ubuntu.com Subject: [SRU][R][PATCH v2 2/2] UBUNTU: SAUCE: bpf: Add missing NULL argument to zap_page_range_single Date: Tue, 25 Aug 2026 11:55:24 -0400 Message-ID: <20260825155524.338587-3-alice.munduruca@canonical.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260825155524.338587-1-alice.munduruca@canonical.com> References: <20260825155524.338587-1-alice.munduruca@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "Alice C. Munduruca via kernel-team" From: "Alice C. Munduruca" Reply-To: "Alice C. Munduruca" Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2165040 Renaming `zap_vma_range()` to `zap_page_range_single()` is insufficient, since not only was the function previously renamed in commit 0326440c3545 ("mm: rename zap_page_range_single() to zap_vma_range()"), but resolute is also missing the commit de008c9ba568 ("mm/memory: remove "zap_details" parameter from zap_page_range_single()") which was not considered in the stable update. This was not caught due to a validation build on CBD firing only for tools, and thus skipping compilation errors in the kernel. Signed-off-by: Alice C. Munduruca --- kernel/bpf/arena.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/arena.c b/kernel/bpf/arena.c index 29205106ee22..95b73d922089 100644 --- a/kernel/bpf/arena.c +++ b/kernel/bpf/arena.c @@ -719,7 +719,7 @@ static void zap_pages(struct bpf_arena *arena, long uaddr, long page_cnt) vma = find_vma(mm, vm_start); if (vma && vma->vm_start == vm_start && vma->vm_file && vma->vm_file->private_data == &arena->map) - zap_page_range_single(vma, uaddr, size); + zap_page_range_single(vma, uaddr, size, NULL); mmap_read_unlock(mm); mmput(mm);