Commit f9a49ab9 authored by Michal Luczaj's avatar Michal Luczaj Committed by Wen Zhiwei
Browse files

selftests/bpf: Support SOCK_STREAM in unix_inet_redir_to_connected() 

stable inclusion
from stable-v6.6.52
commit 14f6a11ea21ed8a6e59b0379623a8d4fa71a6252
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYXOD

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=14f6a11ea21ed8a6e59b0379623a8d4fa71a6252



--------------------------------

[ Upstream commit 1b0ad43177c097d38b967b99c2b71d8be28b0223 ]

Function ignores the AF_UNIX socket type argument, SOCK_DGRAM is hardcoded.
Fix to respect the argument provided.

Fixes: 75e0e27d ("selftest/bpf: Change udp to inet in some function names")
Suggested-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: default avatarMichal Luczaj <mhal@rbox.co>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Tested-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Reviewed-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/20240713200218.2140950-3-mhal@rbox.co


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent fe2d5d44

tools/testing/selftests/bpf/prog_tests/sockmap_listen.c

+1 −2
Original line number Diff line number Diff line
@@ -1841,7 +1841,7 @@ static void unix_inet_redir_to_connected(int family, int type, int sock_mapfd, 
	if (err)

		return;



	if (socketpair(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0, sfd))

	if (socketpair(AF_UNIX, type | SOCK_NONBLOCK, 0, sfd))

		goto close_cli0;

	c1 = sfd[0], p1 = sfd[1];
@@ -1876,7 +1876,6 @@ static void unix_inet_redir_to_connected(int family, int type, int sock_mapfd, 
close_cli0:

	xclose(c0);

	xclose(p0);



}



static void unix_inet_skb_redir_to_connected(struct test_sockmap_listen *skel,