{"id":946,"url":"http://patchwork.ozlabs.org/api/1.0/patches/946/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<200809222110.m8MLAPWg029903@imap1.linux-foundation.org>","date":"2008-09-22T21:10:25","name":"[for,2.6.27?,10/10] gianfar: free/iounmap memory after an error in mii bus initialization","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"b8eb0ef56bd52811d328cc672f898bc757e02cad","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":{"id":36,"url":"http://patchwork.ozlabs.org/api/1.0/users/36/?format=json","username":"jgarzik","first_name":"Jeff","last_name":"Garzik","email":"jgarzik@pobox.com"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/200809222110.m8MLAPWg029903@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/946/checks/","tags":{},"headers":{"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])\n\tby ozlabs.org (Postfix) with ESMTP id 8FB97DDEF0\n\tfor ;\n\tTue, 23 Sep 2008 07:15:53 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752833AbYIVVPs (ORCPT );\n\tMon, 22 Sep 2008 17:15:48 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1752922AbYIVVPs\n\t(ORCPT ); Mon, 22 Sep 2008 17:15:48 -0400","from smtp1.linux-foundation.org ([140.211.169.13]:49506 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1752350AbYIVVPr (ORCPT\n\t); Mon, 22 Sep 2008 17:15:47 -0400","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLDDuH014806\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:14:48 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLAPWg029903; Mon, 22 Sep 2008 14:10:25 -0700"],"Message-Id":"<200809222110.m8MLAPWg029903@imap1.linux-foundation.org>","Subject":"[patch for 2.6.27? 10/10] gianfar: free/iounmap memory after an\n\terror in mii bus initialization","To":"jeff@garzik.org","Cc":"netdev@vger.kernel.org, akpm@linux-foundation.org,\n\tafleming@freescale.com, danielm77@spray.se","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:10:25 -0700","X-Spam-Status":"No, hits=-3.358 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Andy Fleming \n\nRecent changes to MII bus initialization code added exit points which\ndidn't free or iounmap the bus before returning.\n\nAddresses http://bugzilla.kernel.org/show_bug.cgi?id=11372.\n\nSigned-off-by: Andy Fleming \nReported-by: Daniel Marjamki \nCc: Jeff Garzik \nSigned-off-by: Andrew Morton \n---\n\n drivers/net/gianfar_mii.c | 14 ++++++++------\n 1 file changed, 8 insertions(+), 6 deletions(-)","diff":"diff -puN drivers/net/gianfar_mii.c~gianfar-free-iounmap-memory-after-an-error-in-mii-bus-initialization drivers/net/gianfar_mii.c\n--- a/drivers/net/gianfar_mii.c~gianfar-free-iounmap-memory-after-an-error-in-mii-bus-initialization\n+++ a/drivers/net/gianfar_mii.c\n@@ -211,19 +211,21 @@ static int gfar_mdio_probe(struct device\n \tgfar_write(&enet_regs->tbipa, 0);\n \tfor (i = PHY_MAX_ADDR; i > 0; i--) {\n \t\tu32 phy_id;\n-\t\tint r;\n \n-\t\tr = get_phy_id(new_bus, i, &phy_id);\n-\t\tif (r)\n-\t\t\treturn r;\n+\t\terr = get_phy_id(new_bus, i, &phy_id);\n+\t\tif (err)\n+\t\t\tgoto bus_register_fail;\n \n \t\tif (phy_id == 0xffffffff)\n \t\t\tbreak;\n \t}\n \n \t/* The bus is full. We don't support using 31 PHYs, sorry */\n-\tif (i == 0)\n-\t\treturn -EBUSY;\n+\tif (i == 0) {\n+\t\terr = -EBUSY;\n+\n+\t\tgoto bus_register_fail;\n+\t}\n \n \tgfar_write(&enet_regs->tbipa, i);\n \n","prefixes":["for","2.6.27?","10/10"]}