From patchwork Sat Jun 11 15:50:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 100019 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 0CC7EB7089 for ; Sun, 12 Jun 2011 01:51:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758708Ab1FKPvb (ORCPT ); Sat, 11 Jun 2011 11:51:31 -0400 Received: from mail-ww0-f42.google.com ([74.125.82.42]:40533 "EHLO mail-ww0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758690Ab1FKPv3 (ORCPT ); Sat, 11 Jun 2011 11:51:29 -0400 Received: by wwk4 with SMTP id 4so1533879wwk.1 for ; Sat, 11 Jun 2011 08:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=aecZudgf/W7JIAvcBmo+0MIxzHC3bFmKwS3tTA3Bcgw=; b=CFmPhHIkgaBuFGHnW42JBgRaBzlY04yAKApwJNbg1cHXDsN+Vl0Rxi5EUb/J4gk2Ez XxJiU9+Kh7POgkqMQ/HucO4osmzZ/3NUnd8Z07SldGyih5QUVZ2IDS9VmyjFqJVLlBvR xmI8WFOllXk4pWRcNNaK5Ob2weVyjm9jVsjhs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=m/LzIVl36g6LipsXrSH0YcittNCXu7c1VECDhgDjSibB+U+osbhsYRze4Sgw77EvOs 2+jKhh4KXgB/YMp6GGYK09EIZ3K7W9KGybWNGnuv5YjkVVAvm4fWkMGgaQxUtieW45VT yV3KnIfTwrozoiz5J9tClkYHmORfYRUvzLKtM= Received: by 10.216.229.216 with SMTP id h66mr843985weq.4.1307807487579; Sat, 11 Jun 2011 08:51:27 -0700 (PDT) Received: from shale.localdomain ([212.49.88.34]) by mx.google.com with ESMTPS id r20sm1964673wec.7.2011.06.11.08.51.16 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 11 Jun 2011 08:51:26 -0700 (PDT) Date: Sat, 11 Jun 2011 18:50:47 +0300 From: Dan Carpenter To: WANG Cong Cc: Herbert Xu , Neil Horman , "David S. Miller" , Eric Dumazet , "open list:NETWORKING [GENERAL]" , kernel-janitors@vger.kernel.org Subject: [patch] netpoll: call dev_put() on error in netpoll_setup() Message-ID: <20110611155047.GA3583@shale.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is a dev_put(ndev) missing on an error path. This was introduced in 0c1ad04aecb "netpoll: prevent netpoll setup on slave devices". Signed-off-by: Dan Carpenter --- This is a static checker bug, and it's possible I've misunderstood something. -- 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/netpoll.c b/net/core/netpoll.c index 42ea4b0..18d9cbd 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -795,7 +795,8 @@ int netpoll_setup(struct netpoll *np) if (ndev->master) { printk(KERN_ERR "%s: %s is a slave device, aborting.\n", np->name, np->dev_name); - return -EBUSY; + err = -EBUSY; + goto put; } if (!netif_running(ndev)) {