tcp: fix null ptr deref in getsockopt(..., TCP_ULP, ...)
authorDave Watson <davejwatson@fb.com>
Mon, 26 Jun 2017 15:36:47 +0000 (08:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Jun 2017 19:39:11 +0000 (15:39 -0400)
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: Dave Watson <davejwatson@fb.com>
Reported-by: "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp.c

index 058f509ca98ebeb950c286d135f95373c1536dbc..4c88d20d91d4fa7b6b5d43d5791c2c2d100f44ee 100644 (file)
@@ -3062,6 +3062,11 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
                if (get_user(len, optlen))
                        return -EFAULT;
                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))
                        return -EFAULT;
                if (copy_to_user(optval, icsk->icsk_ulp_ops->name, len))