Commit d97af30f authored by Dave Watson's avatar Dave Watson Committed by David S. Miller

tcp: fix null ptr deref in getsockopt(..., TCP_ULP, ...)

If icsk_ulp_ops is unset, it dereferences a null ptr.
Add a null ptr check.

BUG: KASAN: null-ptr-deref in copy_to_user include/linux/uaccess.h:168 [inline]
BUG: KASAN: null-ptr-deref in do_tcp_getsockopt.isra.33+0x24f/0x1e30 net/ipv4/tcp.c:3057
Read of size 4 at addr 0000000000000020 by task syz-executor1/15452
Signed-off-by: default avatarDave Watson <davejwatson@fb.com>
Reported-by: default avatar"Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 019b13ae
...@@ -3062,6 +3062,11 @@ static int do_tcp_getsockopt(struct sock *sk, int level, ...@@ -3062,6 +3062,11 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
if (get_user(len, optlen)) if (get_user(len, optlen))
return -EFAULT; return -EFAULT;
len = min_t(unsigned int, len, TCP_ULP_NAME_MAX); len = min_t(unsigned int, len, TCP_ULP_NAME_MAX);
if (!icsk->icsk_ulp_ops) {
if (put_user(0, optlen))
return -EFAULT;
return 0;
}
if (put_user(len, optlen)) if (put_user(len, optlen))
return -EFAULT; return -EFAULT;
if (copy_to_user(optval, icsk->icsk_ulp_ops->name, len)) if (copy_to_user(optval, icsk->icsk_ulp_ops->name, len))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment