samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

calipso: unlock rcu before returning -EAFNOSUPPORT

Browse Source 
commit 3cae906e1a6184cdc9e4d260e4dbdf9a118d94ad upstream.

syzbot reported that a recent patch forgot to unlock rcu
in the error path.

Adopt the convention that netlbl_conn_setattr() is already using.

Fixes: 6e9f2df1c550 ("calipso: Don't call calipso functions for AF_INET sk.")
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Kuniyuki Iwashima <kuniyu@amazon.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Link: https://patch.msgid.link/20250604133826.1667664-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eric Dumazet
2025-06-04 13:38:26 +00:00
committed by Greg Kroah-Hartman
parent 2cfcbe1554
commit 1380f68517
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/netlabel/netlabel_kapi.c
View File

@@ -1140,8 +1140,10 @@ int netlbl_conn_setattr(struct sock *sk,
break; break;
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
case AF_INET6: case AF_INET6:
if (sk->sk_family != AF_INET6) if (sk->sk_family != AF_INET6) {
return -EAFNOSUPPORT; ret_val = -EAFNOSUPPORT;
goto conn_setattr_return;
}
addr6 = (struct sockaddr_in6 *)addr; addr6 = (struct sockaddr_in6 *)addr;
entry = netlbl_domhsh_getentry_af6(secattr->domain, entry = netlbl_domhsh_getentry_af6(secattr->domain,