From: Dan Carpenter Date: Sat, 22 May 2010 10:43:42 +0000 (+0000) Subject: caif: remove unneeded null check in caif_connect() X-Git-Tag: v2.6.36-rc1~571^2~732 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f5d72af9f3dfea67f014f880d00665f96622f57f;p=platform%2Fkernel%2Flinux-stable.git caif: remove unneeded null check in caif_connect() We already dereferenced uaddr towards the start of the function when we checked that "uaddr->sa_family != AF_CAIF". Both the check here and the earlier check were added in bece7b2398d0: "caif: Rewritten socket implementation". Before that patch, we assumed that we recieved a valid pointer for uaddr, and based on that, I have removed this check. Signed-off-by: Dan Carpenter Acked-by: Sjur Braendeland Signed-off-by: David S. Miller --- diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 3d0e095..7912493 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -874,8 +874,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr, sk_stream_kill_queues(&cf_sk->sk); err = -EINVAL; - if (addr_len != sizeof(struct sockaddr_caif) || - !uaddr) + if (addr_len != sizeof(struct sockaddr_caif)) goto out; memcpy(&cf_sk->conn_req.sockaddr, uaddr,