From 32e9072b92a1c556a303d8d0e0d64feb667e601d Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 19 May 2012 00:51:04 -0400 Subject: [PATCH] ipx: Remove spurious NULL checking in ipx_ioctl(). We already unconditionally dereference 'sk' via lock_sock(sk) earlier in this function, and our caller (sock_do_ioctl()) makes takes similar liberties. Reported-by: Dan Carpenter Signed-off-by: David S. Miller --- net/ipx/af_ipx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index 824d4a3338ae..dfd6faaf0ea7 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c @@ -1901,9 +1901,7 @@ static int ipx_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) (const unsigned short __user *)argp); break; case SIOCGSTAMP: - rc = -EINVAL; - if (sk) - rc = sock_get_timestamp(sk, argp); + rc = sock_get_timestamp(sk, argp); break; case SIOCGIFDSTADDR: case SIOCSIFDSTADDR: -- 2.20.1