From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B8C943CE64; Mon, 17 Aug 2026 14:49:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786978163; cv=none; b=PBxYVsY4fAGmfEypjdnJ9mg8SaNi9r18OjcMFaPkqyLAsIvtudHRe/3tvXY053kVxxktAdJc0E33wqQkEeVVvmesh8SchCJ0e2tn2+cKOBwTJH/jZU0iEuYHfNr7AXEwj7ewrey958Nhy3B9z2+6h5Y/CJiX9tClda8kw3Z0swk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786978163; c=relaxed/simple; bh=p6JtZEWTNN93fFPyePD97imt8xm2EvcRcxmyoi5Ht9o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T1NpNATvIm+/hQAJtz+S/8xRXauiYRKqvQ/qro1X2jor5FeWJEIKSx/59bao0zxIBJbavQdjMHgmNwUR41TcU85C2ohY71ZhatI7cbu8oYFjJRXgN1ripN+w0WrVUFKlwwDoxUFR0VtxLv+L0guBeNIH0x6KQnB//Gp86SRa2TU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=W2v3zIDB; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="W2v3zIDB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F9E51F00A3E; Mon, 17 Aug 2026 14:49:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786978154; bh=LazwIo7S/j77mWAjnBrJy1lvXrIyj5pZ/Jsg50IVz94=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W2v3zIDB5Ujyh0yWj75qHyDN4cYFcZZnv3OuYo+cuLttvV2bmRB5afhfVmNG9ijdv sTu7OV4TZKHcybtW7fmaXGMT4cxs5bascC+Lu+66nYSDAoeiMj7EMTDURrMcGb36QD 5BzLCEiGh7MYYQmzo7PzIwUEWb513iZKK2k6vYSg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michal Luczaj , Kuniyuki Iwashima , Jakub Sitnicki , Kumar Kartikeya Dwivedi , Sasha Levin Subject: [PATCH 6.12 118/181] selftests/bpf: Ensure UDP sockets are bound Date: Mon, 17 Aug 2026 15:33:32 +0200 Message-ID: <20260817132540.193624290@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132535.394764707@linuxfoundation.org> References: <20260817132535.394764707@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michal Luczaj [ Upstream commit fe3ff273767ef22fe8a7cb3816f264927c190e50 ] Update sockmap_basic tests to bind sockets before they are used. This accommodates the recent change in sockmap that rejects unbound UDP sockets. 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-1-f878346f27ab@rbox.co Signed-off-by: Kumar Kartikeya Dwivedi Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/prog_tests/sockmap_basic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c index fb08c565d6aad..99522cf68dc8c 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c @@ -703,7 +703,7 @@ static void test_sockmap_many_socket(void) return; } - udp = xsocket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, 0); + udp = socket_loopback(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK); if (udp < 0) { close(dgram); close(tcp); @@ -772,7 +772,7 @@ static void test_sockmap_many_maps(void) return; } - udp = xsocket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, 0); + udp = socket_loopback(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK); if (udp < 0) { close(dgram); close(tcp); @@ -843,7 +843,7 @@ static void test_sockmap_same_sock(void) return; } - udp = xsocket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, 0); + udp = socket_loopback(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK); if (udp < 0) { close(dgram); close(tcp); -- 2.53.0