From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752110AbdBOSLn convert rfc822-to-8bit (ORCPT ); Wed, 15 Feb 2017 13:11:43 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:21661 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750806AbdBOSLl (ORCPT ); Wed, 15 Feb 2017 13:11:41 -0500 X-IronPort-AV: E=Sophos;i="5.35,166,1483977600"; d="scan'208";a="82445261" X-AuditID: ac1c2133-ab7ff7000001a7e2-8d-58a497df2874 From: Bart Van Assche To: "jejb@linux.vnet.ibm.com" , "colin.king@canonical.com" , "linux-scsi@vger.kernel.org" , "martin.petersen@oracle.com" CC: "linux-kernel@vger.kernel.org" , "axboe@fb.com" , "kernel-janitors@vger.kernel.org" Subject: Re: [PATCH] scsi, block: fix memory leak of sdpk on when gd fails to allocate Thread-Topic: [PATCH] scsi, block: fix memory leak of sdpk on when gd fails to allocate Thread-Index: AQHSh7XETyixuH7FxUi1VicXxxywRA== Date: Wed, 15 Feb 2017 18:03:09 +0000 Message-ID: <1487181776.2666.7.camel@sandisk.com> References: <20170203193854.6782-1-colin.king@canonical.com> In-Reply-To: <20170203193854.6782-1-colin.king@canonical.com> Accept-Language: nl-NL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.181.8.64] Content-Type: text/plain; charset="iso-8859-1" Content-ID: <2DA25FC9E4D29546A76B8CA45B3A0C83@sandisk.com> Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRmVeSWpSXmKPExsWyRobxn+6j6UsiDM71Sln833OMzeL36l42 i1UT8yy23pK2uLxrDptF9/UdbBbLj/9jcmD3mNXQy+Yxsfkdu8eDQ5tZPD4+vcXi8XmTXABr FJdNSmpOZllqkb5dAlfG8rvTmQu6uSr2vZ7E1MDYydHFyMkhIWAice7hXMYuRi4OIYElTBKP Nx9kgXAuMUrcu7CWCaSKTcBIYvaEPWAJEYFXjBL3919jB3GYBVYySiz5uxKsSlggQmL9ylcs ILaIQKTE00sT2boYOYBsPYm1u2tBwiwCqhKbF60AC/MKGEps32gHEhYSsJH4Ou0jO4jNKWAr sW1bNyNICaOArETLa26QMLOAuMStJ/OZII4WkFiy5zwzhC0q8fLxP1aQcgkBeYnrp+0gyvUk bkydwgZhW0ms+tbJAmFrSyxb+BqslVdAUOLkzCcsExjFZiHZMAtJ+ywk7bOQtM9C0r6AkXUV o1hxYnJxbnpqgaGJXnFiXkpmcbZecn7uJkZwhCoa72D8t8H9EKMAB6MSD++L1CURQqyJZcWV uYcYJTiYlUR4BSYBhXhTEiurUovy44tKc1KLDzFKc7AoifPGzJ4aISSQnliSmp2aWpBaBJNl 4uCUamAsDQptCOa7FtBTwfEyx26Cv4T2p7mpfjrz+d/tW7jrznWDGu9lnBJBleoJ3md/T+Pa 7PtPME3q0rlqvtW3fx3SC/nivPnTFYkUVRNlPp6opvdrvKS/vXO9NaFkW51QlOQeJV8rr+dz ZojcrD/7cZuv63ERTdHUXxo6UTurVG9zdAgfcA6em6DEUpyRaKjFXFScCABIruidzAIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2017-02-03 at 19:38 +0000, Colin King wrote: > From: Colin Ian King > > On an allocation failure of gd, the current exit path is via out_free_devt > which leaves sdpk still allocated and hence it gets leaked. Fix this by > correcting the order of resource free'ing with a change in the error exit > path labels. > > Detected by CoverityScan, CID#1399519 ("Resource Leak") > > Fixes: 0dba1314d4f81115dc ("scsi, block: fix duplicate bdi name registration crashes") > Signed-off-by: Colin Ian King > --- > drivers/scsi/sd.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c > index cb6e68d..99e1206 100644 > --- a/drivers/scsi/sd.c > +++ b/drivers/scsi/sd.c > @@ -3213,10 +3213,10 @@ static int sd_probe(struct device *dev) > sd_devt = NULL; > out_put: > put_disk(gd); > - out_free: > - kfree(sdkp); > out_free_devt: > kfree(sd_devt); > + out_free: > + kfree(sdkp); > out: > scsi_autopm_put_device(sdp); > return error; Hello Colin, This patch looks fine to me. But since it is a fix for a patch that exists in Jens' tree and that is not yet upstream, please resubmit it to Jens. Bart.