From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shuah Khan Subject: [PATCH] PM: Fix dev_pm_put_subsys_data() to not call kfree() while holding device power lock Date: Fri, 3 May 2013 20:46:50 +0000 Message-ID: <1367614010.8452.2.camel@lorien> Reply-To: Shuah Khan Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Language: en-US Content-ID: <059CC7F1C823A24F96532224F6AF8F94@sisa.samsung.com> Sender: linux-kernel-owner@vger.kernel.org To: "len.brown@intel.com" , "rafael.j.wysocki@intel.com" , "pavel@ucw.cz" , "gregkh@linuxfoundation.org" Cc: "linux-pm@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "shuahkhan@gmail.com" List-Id: linux-pm@vger.kernel.org ZGV2X3BtX3B1dF9zdWJzeXNfZGF0YSgpIGNhbGxzIGtmcmVlKCkgd2hpbGUgaG9sZGluZyBkZXZp Y2UgcG93ZXIgbG9jaywgd2hlbg0KdGhlIHJlZmVyZW5jZSBjb3VudCBpcyAwLiBGaXggaXQgdG8g Y2FsbCBrZnJlZSgpIGFmdGVyIHJlbGVhc2luZyB0aGUgbG9jay4NCg0KU2lnbmVkLW9mZi1ieTog U2h1YWggS2hhbiA8c2h1YWgua2hAc2Ftc3VuZy5jb20+DQotLS0NCiBkcml2ZXJzL2Jhc2UvcG93 ZXIvY29tbW9uLmMgfCAgICA2ICsrKysrLQ0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMo KyksIDEgZGVsZXRpb24oLSkNCg0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvYmFzZS9wb3dlci9jb21t b24uYyBiL2RyaXZlcnMvYmFzZS9wb3dlci9jb21tb24uYw0KaW5kZXggMzljMzI1Mi4uZGEwNWZl MiAxMDA2NDQNCi0tLSBhL2RyaXZlcnMvYmFzZS9wb3dlci9jb21tb24uYw0KKysrIGIvZHJpdmVy cy9iYXNlL3Bvd2VyL2NvbW1vbi5jDQpAQCAtNzMsMTMgKzczLDE3IEBAIGludCBkZXZfcG1fcHV0 X3N1YnN5c19kYXRhKHN0cnVjdCBkZXZpY2UgKmRldikNCiANCiAJaWYgKC0tcHNkLT5yZWZjb3Vu dCA9PSAwKSB7DQogCQlkZXYtPnBvd2VyLnN1YnN5c19kYXRhID0gTlVMTDsNCi0JCWtmcmVlKHBz ZCk7DQogCQlyZXQgPSAxOw0KIAl9DQogDQogIG91dDoNCiAJc3Bpbl91bmxvY2tfaXJxKCZkZXYt PnBvd2VyLmxvY2spOw0KIA0KKwlpZiAocmV0ID09IDEpIHsNCisJCS8qIGtmcmVlKCkgdmVyaWZp ZXMgdGhhdCBpdHMgYXJndW1lbnQgaXMgbm9uemVyby4gKi8NCisJCWtmcmVlKHBzZCk7DQorCX0N CisNCiAJcmV0dXJuIHJldDsNCiB9DQogRVhQT1JUX1NZTUJPTF9HUEwoZGV2X3BtX3B1dF9zdWJz eXNfZGF0YSk7DQotLSANCjEuNy4xMC40DQoNCg0K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763607Ab3ECUqy (ORCPT ); Fri, 3 May 2013 16:46:54 -0400 Received: from mx2.sisa.samsung.com ([63.166.156.250]:48445 "EHLO mx2.sisa.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763578Ab3ECUqx (ORCPT ); Fri, 3 May 2013 16:46:53 -0400 X-ASG-Debug-ID: 1367614012-051129071a04320001-xx1T2L X-Barracuda-Envelope-From: shuah.kh@samsung.com X-Barracuda-Apparent-Source-IP: 105.144.21.115 X-ASG-Whitelist: Client From: Shuah Khan To: "len.brown@intel.com" , "rafael.j.wysocki@intel.com" , "pavel@ucw.cz" , "gregkh@linuxfoundation.org" CC: "linux-pm@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "shuahkhan@gmail.com" Subject: [PATCH] PM: Fix dev_pm_put_subsys_data() to not call kfree() while holding device power lock Thread-Topic: [PATCH] PM: Fix dev_pm_put_subsys_data() to not call kfree() while holding device power lock X-ASG-Orig-Subj: [PATCH] PM: Fix dev_pm_put_subsys_data() to not call kfree() while holding device power lock Thread-Index: AQHOSD9WkkQkCwYLLkewoPShwxGqcg== Date: Fri, 3 May 2013 20:46:50 +0000 Message-ID: <1367614010.8452.2.camel@lorien> Reply-To: Shuah Khan Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [105.144.34.7] Content-Type: text/plain; charset="utf-8" Content-ID: <059CC7F1C823A24F96532224F6AF8F94@sisa.samsung.com> MIME-Version: 1.0 X-Barracuda-Connect: UNKNOWN[105.144.21.115] X-Barracuda-Start-Time: 1367614012 X-Barracuda-URL: http://192.168.0.102:8000/cgi-mod/mark.cgi X-Barracuda-BRTS-Status: 1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id r43Kkxqw015351 dev_pm_put_subsys_data() calls kfree() while holding device power lock, when the reference count is 0. Fix it to call kfree() after releasing the lock. Signed-off-by: Shuah Khan --- drivers/base/power/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c index 39c3252..da05fe2 100644 --- a/drivers/base/power/common.c +++ b/drivers/base/power/common.c @@ -73,13 +73,17 @@ int dev_pm_put_subsys_data(struct device *dev) if (--psd->refcount == 0) { dev->power.subsys_data = NULL; - kfree(psd); ret = 1; } out: spin_unlock_irq(&dev->power.lock); + if (ret == 1) { + /* kfree() verifies that its argument is nonzero. */ + kfree(psd); + } + return ret; } EXPORT_SYMBOL_GPL(dev_pm_put_subsys_data); -- 1.7.10.4 {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I