From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516767309-2-2279049376237784771 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516767309; b=s0x/lbjtnDlqR0MXdeKG9tgtDhf/rGORZz4e1oODqr0QARd ZCdW5ueHUnWpDHp4Whk2OKxLguyJ5c/+MdBm75hWy5MzxvsVNMpFP7fzQXDx1u7N mHAL5/vGL7p6svYYTmWqpycGQLG1sNNgH4l64C1THRibxDVNlc9p8N9f/ZJH92Ut 3b7I50z+NSN+wmCA4+X6tfbYw6BUJbVM4d2Faksz+VRe+TrAU3s6aTiA8qD3GtrW 00BPVveB8RuKYGWAkHFvlE1GenK9Jcdpg/4EwzwF6ctiTLfaLTbZJZM7Qx2KHCjb /Qwj67gKxdgm02b+kDK45UG8Hrf76U7iDursk4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516767309; bh=PH7osw Z0zp1jNSLAg3hKjkk8Q/nSG6eDKjyoDMslduA=; b=dMU7yNDFEeF8RxtDI5sqIL eRqsv5m/DpL6hCyWJWaR5frzq1NlJIh/rT1XgRSri2BBOs8vzL245LVx1sxYAQm3 xVKaZu+QyvCBvR5FlGIaKp7tmQehTMPr3Q3mK7o9684p5aBEXrITizIGTnbngCcD yqTlwxLOZ7/z4CmmeGlxB4EC8yQkaXZBEQePGYyhVN4MPatlLKbvzMT/9brHte+/ HhzOW5DeoLWZLIEdAnCprRuZzVrehPQPY93nxLMPW+NhBspD3EhTf29JnS5YcABX K8kE6k8R3YLarcTnQyIcNoVELROjPXJDEmzWn6uA+0QnjEKl3GtAa3i3IN8K8cXw == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=BMEGbe1w x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=BMEGbe1w x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752752AbeAXEOl (ORCPT ); Tue, 23 Jan 2018 23:14:41 -0500 Received: from mail-cys01nam02hn0220.outbound.protection.outlook.com ([104.47.37.220]:39506 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752726AbeAXEOj (ORCPT ); Tue, 23 Jan 2018 23:14:39 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: David Disseldorp , Jens Axboe , "Sasha Levin" Subject: [PATCH AUTOSEL for 4.14 027/100] null_blk: fix dev->badblocks leak Thread-Topic: [PATCH AUTOSEL for 4.14 027/100] null_blk: fix dev->badblocks leak Thread-Index: AQHTlMnYkYfLvystTUiE6ewwzM/HIA== Date: Wed, 24 Jan 2018 04:14:36 +0000 Message-ID: <20180124041414.32065-27-alexander.levin@microsoft.com> References: <20180124041414.32065-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041414.32065-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1080;6:F5mQlsSVC/OKYprt2uFUTEQiQBRnubsSWYZp2PCYFircxHBZxeRCfUg/1mMtr/CzmAeK4qxwPqRiqNUY//AHtXKRIpz9qwP9avCAjZwVOCmNnn3/OtWRBTDsmcfbtQr9pr6An+Uhyj0EQBwMNNzaa+28t/DFPOoFnaqUt7+8+GA0YILlDtyqdcIxoENBRLk0+ZBXAn/ZTjWLSYT4dItoecPvEmfs6fxDtzVC8DQzHfbH/MskCaWduR8B5UMOsmuYFK+8zvfpubMHQlL1XjS20OGqOmE8Ukunwz9FbeQM8JqqDIsVyoeCqnv9GLui2mKbeeJQTVgjmmKQDHoWCvzoBnDh2JlXx82uNTaONHucHWaRL7f+GhkYCfXTvgED3WtH9FFoi1ATlChhcHEnRaSJhg==;5:jPhUsYC8fOUJzf46lQdUlZrrwCtSgyzzQRRVF5RnvCgwVR3e9kVe0TpdZdQiFnqQIgw6qUxRUilwFYndgPmWJG8eo5iAQDddPlUFnANA33miqEtv/xWKVIQvQtBQV83DLLbEx73QwPxDNNQTEfYsLCl1cBnflquCmeVQJ9s9bkA=;24:fgOpAkXAXEb4BL0E2rFYGVv5/u61lIoLx8ZxDT0VRrRSPNBriPhDtSHIX1/G/NUL30Kfb1nJR8sXnmYpex+XAA==;7:rT+PpwbAblolM1Yu71BfEjjHZKInQThHE4EwsZkvMUMSGI1jMUWa4Wrs2bKGXb8gBrKR4Iq810ziKHWv85qDiyriKApV3dr30azu52zMjZlUT8H1LOcq922+OG/6qzKSfX/7v8/m1ZlA0SNoO+WpamD55jCNV9RHW/W5jPYF2TZyRXdiV3+hKBc8LnRMMwIvK6cNK96SbVTqYGRQpCp7KWkQLudbNpLCop/FvbT3mQsAIiwpGNwVSX7Z+B99H/NJ x-ms-exchange-antispam-srfa-diagnostics: SSOS;SSOR; x-ms-office365-filtering-correlation-id: cfe8b81a-e52a-4783-d3e0-08d562e0fb14 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1080; x-ms-traffictypediagnostic: DM5PR2101MB1080: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(67672495146484); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231046)(2400081)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1080;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1080; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:SPM;SFS:(10019020)(376002)(396003)(346002)(39860400002)(39380400002)(366004)(189003)(199004)(72206003)(110136005)(316002)(5250100002)(6346003)(2900100001)(54906003)(1076002)(6116002)(3846002)(22452003)(36756003)(53936002)(99286004)(6512007)(68736007)(2501003)(3660700001)(14454004)(3280700002)(86362001)(102836004)(7736002)(5660300001)(305945005)(107886003)(6486002)(6506007)(2906002)(81156014)(26005)(25786009)(4326008)(81166006)(105586002)(8936002)(59450400001)(106356001)(478600001)(10290500003)(6436002)(8676002)(2950100002)(86612001)(97736004)(76176011)(10090500001)(66066001)(22906009)(217873001)(505234006);DIR:OUT;SFP:1501;SCL:5;SRVR:DM5PR2101MB1080;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: ToKvogLNqiGqR8Dwi9RA/zavlidx45jop9WtEGMeHEJMKeipqMJrcJ6+J+NMQEumM0W5zIbmNS1I0pdXo5dsNg== spamdiagnosticoutput: 1:22 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfe8b81a-e52a-4783-d3e0-08d562e0fb14 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:36.5714 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1080 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: David Disseldorp [ Upstream commit 1addb798e93893d33c8dfab743cd44f09fd7719a ] null_alloc_dev() allocates memory for dev->badblocks, but cleanup currently only occurs in the configfs release codepath, missing a number of other places. This bug was found running the blktests block/010 test, alongside kmemleak: rapido1:/blktests# ./check block/010 ... rapido1:/blktests# echo scan > /sys/kernel/debug/kmemleak [ 306.966708] kmemleak: 32 new suspected memory leaks (see /sys/kernel/deb= ug/kmemleak) rapido1:/blktests# cat /sys/kernel/debug/kmemleak unreferenced object 0xffff88001f86d000 (size 4096): comm "modprobe", pid 231, jiffies 4294892415 (age 318.252s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [] kmemleak_alloc+0x49/0xa0 [] kmem_cache_alloc+0x9f/0xe0 [] badblocks_init+0x2f/0x60 [] 0xffffffffa0019fae [] nullb_device_badblocks_store+0x63/0x130 [null_blk] [] do_one_initcall+0x3d/0x170 [] do_init_module+0x56/0x1e9 [] load_module+0x1c47/0x26a0 [] SyS_finit_module+0xa9/0xd0 [] entry_SYSCALL_64_fastpath+0x13/0x94 Fixes: 2f54a613c942 ("nullb: badbblocks support") Reviewed-by: Shaohua Li Signed-off-by: David Disseldorp Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/null_blk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index 4d55af5c6e5b..69dfa1d3f453 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -467,7 +467,6 @@ static void nullb_device_release(struct config_item *it= em) { struct nullb_device *dev =3D to_nullb_device(item); =20 - badblocks_exit(&dev->badblocks); null_free_device_storage(dev, false); null_free_dev(dev); } @@ -578,6 +577,10 @@ static struct nullb_device *null_alloc_dev(void) =20 static void null_free_dev(struct nullb_device *dev) { + if (!dev) + return; + + badblocks_exit(&dev->badblocks); kfree(dev); } =20 --=20 2.11.0