From patchwork Fri Oct 30 09:20:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 37265 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.176.167]) by ozlabs.org (Postfix) with ESMTP id E504DB7C38 for ; Fri, 30 Oct 2009 20:20:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756585AbZJ3JUE (ORCPT ); Fri, 30 Oct 2009 05:20:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756577AbZJ3JUE (ORCPT ); Fri, 30 Oct 2009 05:20:04 -0400 Received: from gw1.cosmosbay.com ([212.99.114.194]:35071 "EHLO gw1.cosmosbay.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755737AbZJ3JUD (ORCPT ); Fri, 30 Oct 2009 05:20:03 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by gw1.cosmosbay.com (8.13.7/8.13.7) with ESMTP id n9U9K5VF012487; Fri, 30 Oct 2009 10:20:05 +0100 Message-ID: <4AEAAFC4.9050309@gmail.com> Date: Fri, 30 Oct 2009 10:20:04 +0100 From: Eric Dumazet User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: "David S. Miller" CC: Linux Netdev List Subject: [RFC, PATCH] net: suspicious test in dev_change_name() X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.6 (gw1.cosmosbay.com [0.0.0.0]); Fri, 30 Oct 2009 10:20:05 +0100 (CET) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org While preparing a patch for net-next-2.6, I noticed following code in dev_change_name() int err = 0; ... ret = call_netdevice_notifiers(NETDEV_CHANGENAME, dev); ret = notifier_to_errno(ret); if (ret) { << HERE >> if (err) { printk(KERN_ERR "%s: name change rollback failed: %d.\n", dev->name, ret); } else { err = ret; memcpy(dev->name, oldname, IFNAMSIZ); goto rollback; } } It seems intent was to test if notifier_to_errno() was null ? Signed-off-by: Eric Dumazet --- -- 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/core/dev.c b/net/core/dev.c index b8f74cf..029cd41 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -939,9 +939,9 @@ rollback: write_unlock_bh(&dev_base_lock); ret = call_netdevice_notifiers(NETDEV_CHANGENAME, dev); - ret = notifier_to_errno(ret); if (ret) { + err = notifier_to_errno(ret); if (err) { printk(KERN_ERR "%s: name change rollback failed: %d.\n",