From patchwork Sat May 22 20:43:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 53287 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 60752B7D27 for ; Sun, 23 May 2010 06:44:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758276Ab0EVUoK (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 Received: by vws9 with SMTP id 9so1657970vws.19 for ; Sat, 22 May 2010 13:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mail-followup-to:mime-version:content-type :content-disposition:user-agent; bh=8pcz1gEQlUFrYPep+FSEiwaRV9iePj5FYbOkNZItie8=; b=kr+UfMfjAGP/lxJpq+ZqJJ+LChZmPpKkyFJoXVpICfuMNEjGFTzvXAHEavYZvukPSZ qBWftHyrK8tCzABhiMLeq9Y7mwG17gvEd64M8NOpi7hFftJ1FXT0Bk1JoUvQSjo0aptx GfssrfvA0iYXY4+XBIeuUd127MPYORSyGcp8I= 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= Received: by 10.220.107.71 with SMTP id a7mr2298087vcp.111.1274561046316; Sat, 22 May 2010 13:44:06 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id w29sm10796076vcr.14.2010.05.22.13.43.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 22 May 2010 13:44:05 -0700 (PDT) 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-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 Acked-by: Sjur Braendeland --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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,