calipso: unlock rcu before returning -EAFNOSUPPORT

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>

diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 2e9344b3c657c47d902b970a3505b73abd2821b0..19325925941f8f54ba1b0cfe6e1b627287587c5f 100644 (file)
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -1140,8 +1140,10 @@ int netlbl_conn_setattr(struct sock *sk,
                break;
 #if IS_ENABLED(CONFIG_IPV6)
        case AF_INET6:
-               if (sk->sk_family != AF_INET6)
-                       return -EAFNOSUPPORT;
+               if (sk->sk_family != AF_INET6) {
+                       ret_val = -EAFNOSUPPORT;
+                       goto conn_setattr_return;
+               }
 
                addr6 = (struct sockaddr_in6 *)addr;
                entry = netlbl_domhsh_getentry_af6(secattr->domain,