* [PATCH net] calipso: unlock rcu before returning -EAFNOSUPPORT
@ 2025-06-04 13:38 Eric Dumazet
2025-06-04 15:59 ` Kuniyuki Iwashima
2025-06-05 15:20 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Eric Dumazet @ 2025-06-04 13:38 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski, Paolo Abeni
Cc: Simon Horman, netdev, eric.dumazet, Eric Dumazet, syzbot,
Kuniyuki Iwashima, Paul Moore, linux-security-module
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>
Cc: linux-security-module@vger.kernel.org
---
net/netlabel/netlabel_kapi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 6ea16138582c0b6ad39608f2c08bdfde7493a13e..33b77084a4e5f34770f960d7c82e481d9889753a 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -1165,8 +1165,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,
--
2.50.0.rc0.604.gd4ff7b7c86-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] calipso: unlock rcu before returning -EAFNOSUPPORT
2025-06-04 13:38 [PATCH net] calipso: unlock rcu before returning -EAFNOSUPPORT Eric Dumazet
@ 2025-06-04 15:59 ` Kuniyuki Iwashima
2025-06-05 15:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Kuniyuki Iwashima @ 2025-06-04 15:59 UTC (permalink / raw)
To: edumazet
Cc: davem, eric.dumazet, horms, kuba, kuniyu, linux-security-module,
netdev, pabeni, paul, syzkaller
From: Eric Dumazet <edumazet@google.com>
Date: Wed, 4 Jun 2025 13:38:26 +0000
> 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>
> Cc: linux-security-module@vger.kernel.org
Thanks for cathcing this!
Reviewed-by Kuniyuki Iwashima <kuni1840@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] calipso: unlock rcu before returning -EAFNOSUPPORT
2025-06-04 13:38 [PATCH net] calipso: unlock rcu before returning -EAFNOSUPPORT Eric Dumazet
2025-06-04 15:59 ` Kuniyuki Iwashima
@ 2025-06-05 15:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2025-06-05 15:20 UTC (permalink / raw)
To: Eric Dumazet
Cc: davem, kuba, pabeni, horms, netdev, eric.dumazet, syzkaller,
kuniyu, paul, linux-security-module
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 4 Jun 2025 13:38:26 +0000 you wrote:
> 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>
> Cc: linux-security-module@vger.kernel.org
>
> [...]
Here is the summary with links:
- [net] calipso: unlock rcu before returning -EAFNOSUPPORT
https://git.kernel.org/netdev/net/c/3cae906e1a61
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-06-05 15:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-04 13:38 [PATCH net] calipso: unlock rcu before returning -EAFNOSUPPORT Eric Dumazet
2025-06-04 15:59 ` Kuniyuki Iwashima
2025-06-05 15:20 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).