From patchwork Sat Oct 18 04:30:06 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 4932 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 8F975DDE20 for ; Sat, 18 Oct 2008 15:30:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750935AbYJREaM (ORCPT ); Sat, 18 Oct 2008 00:30:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750872AbYJREaM (ORCPT ); Sat, 18 Oct 2008 00:30:12 -0400 Received: from mail.vyatta.com ([76.74.103.46]:37417 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750858AbYJREaL (ORCPT ); Sat, 18 Oct 2008 00:30:11 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id 4DEDA4F4631; Fri, 17 Oct 2008 21:30:11 -0700 (PDT) X-Virus-Scanned: amavisd-new at Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Eyv3cSZoy1OU; Fri, 17 Oct 2008 21:30:09 -0700 (PDT) Received: from extreme (unknown [96.225.231.79]) by mail.vyatta.com (Postfix) with ESMTP id A129F4F461F; Fri, 17 Oct 2008 21:30:09 -0700 (PDT) Date: Fri, 17 Oct 2008 21:30:06 -0700 From: Stephen Hemminger To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH] netdev: change name dropping error codes Message-ID: <20081017213006.385c45cd@extreme> Organization: Vyatta X-Mailer: Claws Mail 3.3.1 (GTK+ 2.12.9; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If changename notifier returns an error code, it gets incorrectly cleared during rollback so the error is never returned to the user. Found while testing similar code for MTU changes. Signed-off-by: Stephen Hemminger --- 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 --- a/net/core/dev.c 2008-10-17 18:59:11.000000000 -0700 +++ b/net/core/dev.c 2008-10-17 21:22:30.000000000 -0700 @@ -924,10 +924,10 @@ int dev_change_name(struct net_device *d strlcpy(dev->name, newname, IFNAMSIZ); rollback: - err = device_rename(&dev->dev, dev->name); - if (err) { + ret = device_rename(&dev->dev, dev->name); + if (ret) { memcpy(dev->name, oldname, IFNAMSIZ); - return err; + return ret; } write_lock_bh(&dev_base_lock);