inet: fix IP_TRANSPARENT error handling
Subsystems (3)
PATCH 1/1 inet: fix IP_TRANSPARENT error handling
My recent patch forgot to change error handling for IP_TRANSPARENT socket option.
WARNING: bad unlock balance detected! 6.5.0-rc7-syzkaller-01717-g59da9885767a #0 Not tainted
-------------------------------------
syz-executor151/5028 is trying to release lock (sk_lock-AF_INET) at:
[<ffffffff88213983>] sockopt_release_sock+0x53/0x70 net/core/sock.c:1073 but there are no more locks to release!
other info that might help us debug this:
1 lock held by syz-executor151/5028:
stack backtrace: CPU: 0 PID: 5028 Comm: syz-executor151 Not tainted 6.5.0-rc7-syzkaller-01717-g59da9885767a #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/26/2023 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xd9/0x1b0 lib/dump_stack.c:106 __lock_release kernel/locking/lockdep.c:5438 [inline] lock_release+0x4b5/0x680 kernel/locking/lockdep.c:5781 sock_release_ownership include/net/sock.h:1824 [inline] release_sock+0x175/0x1b0 net/core/sock.c:3527 sockopt_release_sock+0x53/0x70 net/core/sock.c:1073 do_ip_setsockopt+0x12c1/0x3640 net/ipv4/ip_sockglue.c:1364 ip_setsockopt+0x59/0xe0 net/ipv4/ip_sockglue.c:1419 raw_setsockopt+0x218/0x290 net/ipv4/raw.c:833 __sys_setsockopt+0x2cd/0x5b0 net/socket.c:2305 __do_sys_setsockopt net/socket.c:2316 [inline] __se_sys_setsockopt net/socket.c:2313 [inline]
--- net/ipv4/ip_sockglue.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/ipv4/ip_sockglue.c +3 -5
@@ -1007,12 +1007,10 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname,return 0 ;case IP_TRANSPARENT :if (!!val && !sockopt_ns_capable (sock_net (sk)->user_ns,CAP_NET_RAW ) && - !sockopt_ns_capable (sock_net (sk)->user_ns,CAP_NET_ADMIN )) { - err = -EPERM ; -break ; - } + !sockopt_ns_capable (sock_net (sk)->user_ns,CAP_NET_ADMIN )) +return -EPERM ;if (optlen <1 ) - goto e_inval; +return -EINVAL ;inet_assign_bit (TRANSPARENT , sk, val);return 0 ;case IP_NODEFRAG :
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
This patch was applied to bpf/bpf-next.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by David S. Miller <[email protected]>:
Quoted 11 lines · On Mon, 28 Aug 2023 08:47:32 +0000 you wrote:
My recent patch forgot to change error handling for
IP_TRANSPARENTsocket option.WARNING: bad unlock balance detected! 6.5.0-rc7-syzkaller-01717-g59da9885767a #0 Not tainted
-------------------------------------
syz-executor151/5028 is trying to release lock (sk_lock-AF_INET) at:
[<ffffffff88213983>]sockopt_release_sock+0x53/0x70net/core/sock.c:1073but there are no more locks to release![...]
Here is the summary with links:
- [net-next] inet: fix IP_TRANSPARENT error handling
https://git.kernel.org/bpf/bpf-next/c/8be6f88b9d3f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html