caif: remove unneeded null check in caif_connect()

PATCH Applied Dan Carpenter 3 participants 4 messages May 22, 2010 – May 31, 2010

Subsystems (3)

Networking Network drivers Kernel janitors

lore

Share & tools

lore

Dan Carpenter

author

2010-05-22 20:43 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

net/caif/caif_socket.c +1 -2

index c3a70c5..bd67bb3 100644
@@ -890,8 +890,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,

Sjur Brændeland

Acked-by Sjur Braendeland on v1 1/1

2010-05-24 19:56 UTC #1 lore raw

Quoted 7 lines · Dan Carpenter

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 <[email protected]>

Thanks Looks good,

Acked-by Sjur Braendeland <[email protected]>

David Miller

maintainer Applied

2010-05-31 07:31 UTC #2 lore raw

From: Sjur Brændeland <[email protected]>
Date: Mon, 24 May 2010 21:56:01 +0200

Quoted 10 lines

Quoted 7 lines · Dan Carpenter
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 <[email protected]>
Thanks Looks good,
Acked-by Sjur Braendeland <[email protected]>

Applied.