From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758365Ab0EVUoK (ORCPT ); Sat, 22 May 2010 16:44:10 -0400 Received: from mail-vw0-f46.google.com ([209.85.212.46]:62739 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758039Ab0EVUoH (ORCPT ); Sat, 22 May 2010 16:44:07 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mail-followup-to:mime-version :content-type:content-disposition:user-agent; b=eM3n7DY7MkcC++PEZnixHHkXmO8uLNVto9jXny317OTT3h48E3ZHpnvxoVasSy0LaX /LSZQoQPHiN4ofRs+wDu0JGPXJJhMISbH1ZhPLZtyVb+dd0JkJU6tINh/2Ppc+VED7OL XoziNGeT7AI1AAX8mQ7nUf7nAIt7x3NBhq06k= Date: Sat, 22 May 2010 22:43:42 +0200 From: Dan Carpenter To: Sjur Braendeland Cc: Eric Dumazet , "David S. Miller" , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] caif: remove unneeded null check in caif_connect() Message-ID: <20100522204342.GV22515@bicker> Mail-Followup-To: Dan Carpenter , Sjur Braendeland , Eric Dumazet , "David S. Miller" , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index c3a70c5..bd67bb3 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -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,