From nobody Tue Sep 29 11:19:37 2026 Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBD3840BCAB for ; Sat, 8 Aug 2026 12:41:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786192899; cv=none; b=DQVTRB+PmAI1EkRaQAQyD4wmoqtyQ963zUiLywtBlbM6TuwVBKWQ/NQ3NEoX+l7Y/VazfisQcimHycdyzVtdE46qvyBePHULNWeL3Z6tKIPzr+XIIcgZgfYZ+BpOhsEY6FlGiA1pNC2VeurzBwIGaMioyc+5hImb7bnhqBvKbcE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786192899; c=relaxed/simple; bh=3lxrWPAXShGIF4WokebW2QU8IfNJNi2a46LUj++s6BM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=GpzQ3vPJKpsiDbCVBXlUGaRbnfMG9els8HjRt2VZgEeomlp3jFj14yLAfDUt+3MXBAbkuJGgG+gf2tQvzvL50QbY1JUxmBXh5o6OiJyeDnCNZECCXz9CieEp7gX74ASJS8C9okYYlRjbYEFA7XrajXJrpt7k9SaA9MTzES1yqV8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marliere.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=marliere.net header.i=@marliere.net header.b=QJm9AIoP; arc=none smtp.client-ip=209.85.160.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marliere.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marliere.net header.i=@marliere.net header.b="QJm9AIoP" Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-44ae14b4fd6so110550fac.2 for ; Sat, 08 Aug 2026 05:41:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786192891; x=1786797691; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=osXi6LaDiTO28e9dN3yuQi9vCnsQZpZjj6p/k64AO1A=; b=XOKSVQi6GKO2maWynAAM65KT8Jevyztko7r4b8bX0RHq6/ozgyvXAJSw63imIv8YP8 r9qFx7Gfxo1wY4WosjiGJGkxJ3UZYvA72CXIfZ659YKPjinXZH94iWMLArAz2/EFFdX8 ckeNtyv6zb3NHFlyGapE10AKzS3OSEOVaEge4Ad06YR0/uauEBm+F/ewN6Am7CoDtuZv cQaLB7eTpneEzRZo53ZakssHlSrIjD3kR7vl5rIq5QnAUwW/5LMvBLRovcBAMc2u8Flh RKeY1g8NtRHdbUhUrGqYfaXp4JnMLc2jchf2za5BQqlnpXYv1SxUSgSDqJc614TEUELO W4ww== X-Forwarded-Encrypted: i=1; AHgh+RpXc+8U+1DbjZ6iiYKXtFbEqXoSQtLuaGh47m70ucbMhy0TLGsfKWixSBkRiSJHSuGIeu3JSVmBN7Ut89Y=@vger.kernel.org X-Gm-Message-State: AOJu0YyXerZeUNae0mJ8K3S7ha/Tt/fvP2GVE+urvzafWzGms3pLvf0C NDiBpNilftwWGOTt0atYXedTazA4OpWa3oqL3Re6rXCcHMbUmR4bgsft X-Gm-Gg: AR+sD13t/dlM32y3ZAvcsAHAwZy2SptiF1zR9+55yN+3TsmatkKExu8nPeyFXrvauIE vMe4fe6rN/ipvNuNViin7P/Htn7myEXPil3vqOrvaEYt5Tl28xDBPQlQT3nLGlJ8ysDj+1EVuiz 4RqnHvrE1tONjYAZGHDIT4/pY9D7IdO72TwHnGC0oX+Av+jPqkNSpGjYVocCHtH3MyV4Ek8gZsW PzemC66G7Gvy0OWC67OB/ND0wMhpfW6EyJr7qXJ5VelmjFG3ZNkWK7FduMcj/VXe2kbf2mcYsVD ij6ZV2nGXLRO8+29PDr1/Va/cGXSO7+x8HCip1+DGsVIatlmbiEINy7kiznoxeDXthBwBEZGVVl EekhJWh/1uEF8dTkC4u56O785yImZkAja9L50wviOx0grw46oFrsWqLjOeKRV1AMBd7MeUfMXmM F7x6UNhsDm0cO8uBWvHyzr9uOGQsqEPkfJIWXmrUhKHGxj4pmUllQceD41xsh5N59AXVAHvEF04 4OKhS5v0VcR4g6SlQKN6XCv7tHcRTuTCSpBWrkx04Ts9o9NBsXscyYE4bTO/HYhag== X-Received: by 2002:a05:6809:115:10b0:4b1:b83c:cbff with SMTP id 5614622812f47-4b1b83ccca8mr926374b6e.14.1786192891032; Sat, 08 Aug 2026 05:41:31 -0700 (PDT) Received: from mail.marliere.net (137.65.66.34.bc.googleusercontent.com. [34.66.65.137]) by smtp.gmail.com with ESMTPSA id 5614622812f47-4b1af63d8acsm1957414b6e.15.2026.08.08.05.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Aug 2026 05:41:30 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 44EA760CCA; Sat, 8 Aug 2026 12:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marliere.net; s=dkim; t=1786192888; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding; bh=osXi6LaDiTO28e9dN3yuQi9vCnsQZpZjj6p/k64AO1A=; b=QJm9AIoPWD8yutMlKlTwJWZaPaJRBe74IyCDGTnc5vrunBbOsFDDOzalruPL5QirVKcAuM i1Lf4qGvjgHAkDVUDU+HM8s8IUiOaBbTkIzryNYdpPaLGPPAcJImvvbdBiSd2z7DFfk6lI rLBLC+yeySPxMbfK9ZUKDtUg14eoXE9MOIjjTFX/qdx3rh8VSUiM1wDo0wMd/ppMIHhE8G /djRZnu8TaKX3K+DYfo+S9X0LJbyhVFME9MqI9GprlKDxhK1+rYian30och4fc+Soc75qx 45te9yWvH99aCFWUKPGLPuMhhKsaIH47jVsMKeURuQsLYLImPQlFMrrDj3fafw== From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re_=28SUSE=29?= Date: Sat, 08 Aug 2026 09:41:11 -0300 Subject: [PATCH 7.1.y v2] selftests/bpf: Fail unbound UDP on sockmap update Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260808-selftests-bpf-sockmap-v2-1-c7ffa9a2a652@marliere.net> X-B4-Tracking: v=1; b=H4sIAOYjd2oC/4WOSw6CMBRFt0Le2BJaCB9H7sMwaMurVKGQvkokh L1LcQEO7+/kbkDoLRJckw08Lpbs5A4hLgnoXroHMtsdGkQmyqzOKkY4mIAUiKnZMJr0a5Qzq2r eKdHowjQFHNvZo7Gfk3uHKuXpCu3Pprd6og6RGYtKEjLlpdN9tChINWAMekth8ut5bOEn58+Hh TPOal00eWlkluvuNko/WPSYOgzQ7vv+BcWSsUTvAAAA X-Change-ID: 20260807-selftests-bpf-sockmap-781db29c4f94 To: Shuah Khan , sashal@kernel.org, gregkh@linuxfoundation.org, Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Michal Luczaj , Kuniyuki Iwashima , Jakub Sitnicki , =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re_=28SUSE=29?= X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openssh-sha256; t=1786192881; l=2322; i=ricardo@marliere.net; h=from:subject:message-id; bh=qHrSlgjj3za7PJl8EnqfTO8/vRQJwzZVFEAcqanD1UA=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QCT/rpBMqA7HKxECSLIgqYnZkVGVBOYjQYzEOy5xK/bpGxxkt7fajmEKXvLC4qBEWYpYEJqZtYa +uZpLTqSUegE= X-Developer-Key: i=ricardo@marliere.net; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g X-Last-TLS-Session-Version: TLSv1.3 From: Michal Luczaj [ Upstream commit 203b06932777b9ad5085319389dea566f5c2ca63 ] sockmap now rejects unbound UDP sockets. Adjust test_maps. While at it, check socket()'s return value. This effectively reverts commit c39aa2159974 ("bpf, selftests: Fix test_maps now that sockmap supports UDP"). Signed-off-by: Michal Luczaj Reviewed-by: Kuniyuki Iwashima Reviewed-by: Jakub Sitnicki Link: https://lore.kernel.org/bpf/20260707-sockmap-lookup-udp-leak-v4-4-f87= 8346f27ab@rbox.co Signed-off-by: Kumar Kartikeya Dwivedi Signed-off-by: Ricardo B. Marli=C3=A8re (SUSE) --- Hi, backporting commit 66efd3368ae1 ("bpf, sockmap: Reject unhashed UDP sockets on sockmap update") without this one broke the selftest in openSUSE CI: https://openqa.opensuse.org/tests/6147940/logfile?filename=3Dtest_maps.tap.= txt Changes in v2: - Sign off - Link to v1: https://patch.msgid.link/20260807-selftests-bpf-sockmap-v1-1-= 8c4936fa03cd@marliere.net --- tools/testing/selftests/bpf/test_maps.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selfte= sts/bpf/test_maps.c index ccc5acd55ff9..d194b44ff8be 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -748,16 +748,15 @@ static void test_sockmap(unsigned int tasks, void *da= ta) goto out_sockmap; } =20 - /* Test update with unsupported UDP socket */ + /* Test update with unsupported unbound UDP socket */ udp =3D socket(AF_INET, SOCK_DGRAM, 0); - i =3D 0; - err =3D bpf_map_update_elem(fd, &i, &udp, BPF_ANY); - if (err) { - printf("Failed socket update SOCK_DGRAM '%i:%i'\n", - i, udp); + CHECK(udp < 0, "socket(AF_INET, SOCK_DGRAM)", "errno:%d\n", errno); + err =3D bpf_map_update_elem(fd, &(int){0}, &udp, BPF_ANY); + close(udp); + if (!err) { + printf("Unexpectedly succeeded unbound UDP update '0:%i'\n", udp); goto out_sockmap; } - close(udp); =20 /* Test update without programs */ for (i =3D 0; i < 6; i++) { --- base-commit: 74b69060ba6e44e20c2e4dc1847eca21db6e4a7c change-id: 20260807-selftests-bpf-sockmap-781db29c4f94 Best regards, -- =20 Ricardo B. Marli=C3=A8re (SUSE)