From patchwork Sun Jan 10 10:43:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 42572 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 2878AB7C3C for ; Sun, 10 Jan 2010 21:43:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753391Ab0AJKnL (ORCPT ); Sun, 10 Jan 2010 05:43:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753294Ab0AJKnK (ORCPT ); Sun, 10 Jan 2010 05:43:10 -0500 Received: from smtp.mujha-vel.cz ([81.30.225.246]:33685 "EHLO smtp.mujha-vel.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753260Ab0AJKnJ (ORCPT ); Sun, 10 Jan 2010 05:43:09 -0500 Received: from [217.66.174.142] (helo=localhost.localdomain) by smtp.mujha-vel.cz with esmtp (Exim 4.63) (envelope-from ) id 1NTvGF-0002Ea-Ij; Sun, 10 Jan 2010 11:43:07 +0100 From: Jiri Slaby To: davem@davemloft.net Cc: adobriyan@gmail.com, linux-kernel@vger.kernel.org, jirislaby@gmail.com, Alexey Kuznetsov , "Pekka Savola (ipv6)" , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , netdev@vger.kernel.org Subject: [PATCH 1/1] NET: ipv6, remove unnecessary check Date: Sun, 10 Jan 2010 11:43:03 +0100 Message-Id: <1263120183-16365-1-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.6.5.7 In-Reply-To: <20100110103528.GA4769@x200> References: <20100110103528.GA4769@x200> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Stanse found a potential null dereference in snmp6_unregister_dev. There is a check for idev being NULL, but it is dereferenced earlier. But idev cannot be NULL when passed to snmp6_unregister_dev, so remove the test. Signed-off-by: Jiri Slaby Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: "Pekka Savola (ipv6)" Cc: James Morris Cc: Hideaki YOSHIFUJI Cc: Patrick McHardy Cc: netdev@vger.kernel.org --- net/ipv6/proc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index c9605c3..7b197b7 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c @@ -259,7 +259,7 @@ int snmp6_unregister_dev(struct inet6_dev *idev) struct net *net = dev_net(idev->dev); if (!net->mib.proc_net_devsnmp6) return -ENOENT; - if (!idev || !idev->stats.proc_dir_entry) + if (!idev->stats.proc_dir_entry) return -EINVAL; remove_proc_entry(idev->stats.proc_dir_entry->name, net->mib.proc_net_devsnmp6);