{"id":807243,"url":"http://patchwork.ozlabs.org/api/1.2/patches/807243/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170829190855.fabfktv2dg57x3gs@mwanda/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/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,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170829190855.fabfktv2dg57x3gs@mwanda>","list_archive_url":null,"date":"2017-08-29T19:15:16","name":"[net] nfp: double free on error in probe","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"71e194fb252d0bc28827424ebc4d9ca779c56439","submitter":{"id":9327,"url":"http://patchwork.ozlabs.org/api/1.2/people/9327/?format=json","name":"Dan Carpenter","email":"dan.carpenter@oracle.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170829190855.fabfktv2dg57x3gs@mwanda/mbox/","series":[{"id":445,"url":"http://patchwork.ozlabs.org/api/1.2/series/445/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=445","date":"2017-08-29T19:15:16","name":"[net] nfp: double free on error in probe","version":1,"mbox":"http://patchwork.ozlabs.org/series/445/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807243/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807243/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhdf724vdz9sRV\n\tfor ;\n\tWed, 30 Aug 2017 05:16:15 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751455AbdH2TQM (ORCPT );\n\tTue, 29 Aug 2017 15:16:12 -0400","from aserp1040.oracle.com ([141.146.126.69]:45166 \"EHLO\n\taserp1040.oracle.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751215AbdH2TQL (ORCPT\n\t); Tue, 29 Aug 2017 15:16:11 -0400","from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233])\n\tby aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2)\n\twith ESMTP id v7TJG79O005652\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Tue, 29 Aug 2017 19:16:07 GMT","from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72])\n\tby aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id v7TJG65N016125\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Tue, 29 Aug 2017 19:16:06 GMT","from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25])\n\tby userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id\n\tv7TJG5oo007194; Tue, 29 Aug 2017 19:16:06 GMT","from mwanda (/41.202.241.35)\n\tby default (Oracle Beehive Gateway v4.0)\n\twith ESMTP ; Tue, 29 Aug 2017 12:16:04 -0700"],"Date":"Tue, 29 Aug 2017 22:15:16 +0300","From":"Dan Carpenter ","To":"Jakub Kicinski ","Cc":"\"David S. Miller\" ,\n\tSimon Horman ,\n\toss-drivers@netronome.com, netdev@vger.kernel.org,\n\tkernel-janitors@vger.kernel.org","Subject":"[PATCH net] nfp: double free on error in probe","Message-ID":"<20170829190855.fabfktv2dg57x3gs@mwanda>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","X-Mailer":"git-send-email haha only kidding","User-Agent":"NeoMutt/20170609 (1.8.3)","X-Source-IP":"aserv0021.oracle.com [141.146.126.233]","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Both the nfp_net_pf_app_start() and the nfp_net_pci_probe() functions\ncall nfp_net_pf_app_stop_ctrl(pf) so there is a double free. The free\nshould be done from the probe function because it's allocated there so\nI have removed the call from nfp_net_pf_app_start().\n\nFixes: 02082701b974 (\"nfp: create control vNICs and wire up rx/tx\")\nSigned-off-by: Dan Carpenter ","diff":"diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c\nindex d55f6c5ed1be..7c22cc4654b7 100644\n--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c\n+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c\n@@ -458,7 +458,7 @@ static int nfp_net_pf_app_start(struct nfp_pf *pf)\n \n \terr = nfp_app_start(pf->app, pf->ctrl_vnic);\n \tif (err)\n-\t\tgoto err_ctrl_stop;\n+\t\treturn err;\n \n \tif (pf->num_vfs) {\n \t\terr = nfp_app_sriov_enable(pf->app, pf->num_vfs);\n@@ -470,8 +470,6 @@ static int nfp_net_pf_app_start(struct nfp_pf *pf)\n \n err_app_stop:\n \tnfp_app_stop(pf->app);\n-err_ctrl_stop:\n-\tnfp_net_pf_app_stop_ctrl(pf);\n \treturn err;\n }\n \n","prefixes":["net"]}