From patchwork Mon Mar 19 15:59:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132089 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp75152ljb; Mon, 19 Mar 2018 14:32:53 -0700 (PDT) X-Google-Smtp-Source: AG47ELuGnOTH6qQhCHwmF0RRemoSU2YI8tbv7D170+PDpMWsNh1rYbVVztBz+CIc2jSQK5vXPZTO X-Received: by 2002:a17:902:4103:: with SMTP id e3-v6mr13967798pld.172.1521495173181; Mon, 19 Mar 2018 14:32:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521495173; cv=none; d=google.com; s=arc-20160816; b=YRoMsTaWqJxdqvt2GtmImHxwJzzLvztqQSIDRVNUdkxoQz6SluMbJqXnQtqWwAeNTv x/1TJ2vGdILbS0ODEiec9ifoZILnwU33I6dq3EvofBMfNBJeXRWcUE+ZWQzJocTKhM80 6g0GN4UgK9mhhh+ymwYhXK9ZWhI+unidDlDCyy+Mvz1C+ytOG+qXGJ1rInAY8S9JzUaX oTPOKjFj4Yl9hIy96Z0odFHuS8VuMYRaTEWYer8/kp1DmVOafqAyzUHl5yCPndkeJPJC AIYQKNDuYnssbkMjyp0Gb+NyqKHf82QJjfP+NyU7CPzw3CSfEPDPloB5fIAMjfRQh/Os fWMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=R6Ep0p0kmfv9aZ+UO19+Tojti3NkRi5DKoH3sh5YEOs=; b=oJznvXIG8waivYjoVECd6iLuoeki63rA+T81mbk2na/soRoVp4Fcyf/8CBtyxdaIfi vDvHzrdSNYbmLYdi8MjCFNzVVWaIZE/TTwVIQqBTu0L3QecXr5Sups0COKdwsDLTg6GN vYwhY0fNfj31/YLEZekqGW/Bdnvkby1kwIh4J2bHxpdjvAfhiz+gXfX5T7SIwrs8/NM0 PGLwv7f5hGGBgwQnGpisptQTa7ZP43XRdCc7JWzzzNAVeCUEJBdoO8i2h0cyqLKVg0oM eNTRhuSl8FpuhGnmZ4tuUaQwzPd5qWV1dBXVg5C3fc7uv/LDugmPiuDV3bIfDp0NcisR PvyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=SGrPwA3p; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l14si114744pgn.188.2018.03.19.14.32.52; Mon, 19 Mar 2018 14:32:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=SGrPwA3p; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S970962AbeCSVcu (ORCPT + 28 others); Mon, 19 Mar 2018 17:32:50 -0400 Received: from mail-by2nam01on0128.outbound.protection.outlook.com ([104.47.34.128]:43648 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965185AbeCSP75 (ORCPT ); Mon, 19 Mar 2018 11:59:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=R6Ep0p0kmfv9aZ+UO19+Tojti3NkRi5DKoH3sh5YEOs=; b=SGrPwA3pC/37EAWWGzHeXSPS5T3mRsaTu7Ux/jd4tpN25awUebgLwHvKlOgC+/SvZDAAkq9UYDtdlR2bGXH599fi3dwwTq4Pu3NnjUWQ1xXTNV3Nd3MmUbjdrvaStSzMJQqbZBs5VrFNJ0nfPZfbWWf9Xl80rxlnu22zxQkCHAI= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0965.namprd21.prod.outlook.com (52.132.133.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 15:59:54 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 15:59:54 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Suman Anna , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 062/281] uio: fix incorrect memory leak cleanup Thread-Topic: [PATCH AUTOSEL for 4.9 062/281] uio: fix incorrect memory leak cleanup Thread-Index: AQHTv5sz9quVrKCnTkSJB/hrvviQAA== Date: Mon, 19 Mar 2018 15:59:02 +0000 Message-ID: <20180319155742.13731-62-alexander.levin@microsoft.com> References: <20180319155742.13731-1-alexander.levin@microsoft.com> In-Reply-To: <20180319155742.13731-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; DM5PR2101MB0965; 7:US3Zs0j02vQ59ji3Wj4wR+goe8XCIYLP/k/CAojThIjGV127xbavOAxOvuVzUERyE0yBO1b9qHrtajoT1pvGUbhs0HjBSMzH+++xdovzT5FdXKyw+SYHW1s7whvPfYnijhv8Eo8KU3MyGy4se19H4QtUjNpu6a50kaa6FAcOKYmQukFYg2+6sdh2FmWdwpTR/JGe65vDg1dUzHJvid6rrPeXKZV5TaegzYIJ8QATSoOvzBZd0rGnHfs5NlX5OpG6; 20:0cM0MKeO8Gz4FuVdKLXYxxBK+QZKiX523pwMmfOdLnM1aim8KWXcfLx5wkBJChDDPE9iZHJLFHHlh2NeMkRqRIM2pk33l94NKHUTcy2g7Lm7snIrEQoH5Mqepdf1uN8hcsT5j8eflLEo42rthjXejEgkDFHMgSIOG0LbNggzJhs= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: a7f5f0e1-dd88-4fc7-df25-08d58db274f5 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0965; x-ms-traffictypediagnostic: DM5PR2101MB0965: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(31051911155226)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB0965; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0965; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(396003)(39860400002)(376002)(39380400002)(189003)(199004)(25786009)(7736002)(6506007)(86362001)(575784001)(86612001)(10090500001)(478600001)(53936002)(6666003)(6512007)(36756003)(2950100002)(8936002)(110136005)(54906003)(105586002)(14454004)(107886003)(72206003)(10290500003)(316002)(102836004)(2501003)(59450400001)(5250100002)(99286004)(22452003)(305945005)(6436002)(6486002)(1076002)(76176011)(26005)(4326008)(186003)(97736004)(106356001)(3660700001)(3846002)(6116002)(5660300001)(68736007)(2900100001)(8676002)(81166006)(81156014)(3280700002)(2906002)(66066001)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0965; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Y3TJAvsUnRZ/kJ6oDUSxVMY2DGFxLCcwBy4GeKaZZnKm1YrQKiv7YnqO4j0h4mhLRvRn295LIFdekTu8dQtVIGugJ22TcA62PaC7SdJTuTQvIc1RocQKeziEk+XCnE+pJ5i6qckIdvHmCOm1naZCKmJYcrhe3m673iPWmyCEUn0MBbY6zVSrOylPiTEkrk6VSoCp9MDRcd9LhCVAxECmXEYr3WEU3G1zYbQNjRIyaKzb4Ili0VaD2GbCLKaQVj9+ewkRphtHruH3FYzYp403bd6vdIOl907ervNS2SbwON+YCzjRT7XgjlURq7NJyw2eKSQ4OXCv5GR0YCj9WcXdxg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7f5f0e1-dd88-4fc7-df25-08d58db274f5 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 15:59:02.6410 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0965 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suman Anna [ Upstream commit 0d83539092ddb1ab79b4d65bccb866bf07ea2ccd ] Commit 75f0aef6220d ("uio: fix memory leak") has fixed up some memory leaks during the failure paths of the addition of uio attributes, but still is not correct entirely. A kobject_uevent() failure still needs a kobject_put() and the kobject container structure allocation failure before the kobject_init() doesn't need a kobject_put(). Fix this properly. Fixes: 75f0aef6220d ("uio: fix memory leak") Signed-off-by: Suman Anna Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/uio/uio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.14.1 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index fba021f5736a..208bc52fc84d 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -279,7 +279,7 @@ static int uio_dev_add_attributes(struct uio_device *idev) map = kzalloc(sizeof(*map), GFP_KERNEL); if (!map) { ret = -ENOMEM; - goto err_map_kobj; + goto err_map; } kobject_init(&map->kobj, &map_attr_type); map->mem = mem; @@ -289,7 +289,7 @@ static int uio_dev_add_attributes(struct uio_device *idev) goto err_map_kobj; ret = kobject_uevent(&map->kobj, KOBJ_ADD); if (ret) - goto err_map; + goto err_map_kobj; } for (pi = 0; pi < MAX_UIO_PORT_REGIONS; pi++) { @@ -308,7 +308,7 @@ static int uio_dev_add_attributes(struct uio_device *idev) portio = kzalloc(sizeof(*portio), GFP_KERNEL); if (!portio) { ret = -ENOMEM; - goto err_portio_kobj; + goto err_portio; } kobject_init(&portio->kobj, &portio_attr_type); portio->port = port; @@ -319,7 +319,7 @@ static int uio_dev_add_attributes(struct uio_device *idev) goto err_portio_kobj; ret = kobject_uevent(&portio->kobj, KOBJ_ADD); if (ret) - goto err_portio; + goto err_portio_kobj; } return 0;