| Message ID | 1467697807-27067-1-git-send-email-vikas.cha.sajjan@hpe.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tue, Jul 05, 2016 at 11:20:07AM +0530, Vikas C Sajjan wrote: > If devm_add_action() fails, we are explicitly calling the cleanup to free > the resources allocated. Use the helper devm_add_action_or_reset() > and return directly in case of error, since the cleanup function > has been already called by the helper if there was any error. > > Reported-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> > Signed-off-by: Vikas C Sajjan <vikas.cha.sajjan@hpe.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Thanks, applied. On Mon, Jul 4, 2016 at 11:59 PM, Johannes Thumshirn <jthumshirn@suse.de> wrote: > On Tue, Jul 05, 2016 at 11:20:07AM +0530, Vikas C Sajjan wrote: >> If devm_add_action() fails, we are explicitly calling the cleanup to free >> the resources allocated. Use the helper devm_add_action_or_reset() >> and return directly in case of error, since the cleanup function >> has been already called by the helper if there was any error. >> >> Reported-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> >> Signed-off-by: Vikas C Sajjan <vikas.cha.sajjan@hpe.com> > > Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> > > -- > Johannes Thumshirn Storage > jthumshirn@suse.de +49 911 74053 689 > SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg > GF: Felix Imendörffer, Jane Smithard, Graham Norton > HRB 21284 (AG Nürnberg) > Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
DQotLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KRnJvbTogRGFuIFdpbGxpYW1zIFttYWlsdG86 ZGFuLmoud2lsbGlhbXNAaW50ZWwuY29tXSANClNlbnQ6IFRodXJzZGF5LCBKdWx5IDA3LCAyMDE2 IDM6NDkgQU0NClRvOiBKb2hhbm5lcyBUaHVtc2hpcm4gPGp0aHVtc2hpcm5Ac3VzZS5kZT4NCkNj OiBTYWpqYW4sIFZpa2FzIEMgPHZpa2FzLmNoYS5zYWpqYW5AaHBlLmNvbT47IFJvc3MgWndpc2xl ciA8cm9zcy56d2lzbGVyQGxpbnV4LmludGVsLmNvbT47IGxpbnV4LW52ZGltbUBsaXN0cy4wMS5v cmc7IExpbnV4IEFDUEkgPGxpbnV4LWFjcGlAdmdlci5rZXJuZWwub3JnPjsgS25pcHBlcnMsIExp bmRhIDxsaW5kYS5rbmlwcGVyc0BocGUuY29tPg0KU3ViamVjdDogUmU6IFtQQVRDSF0gZGF4OiB1 c2UgZGV2bV9hZGRfYWN0aW9uX29yX3Jlc2V0KCkNCg0KVGhhbmtzLCBhcHBsaWVkLg0KDQpUaGFu ayB5b3UsIERhbi4NCiANCk9uIE1vbiwgSnVsIDQsIDIwMTYgYXQgMTE6NTkgUE0sIEpvaGFubmVz IFRodW1zaGlybiA8anRodW1zaGlybkBzdXNlLmRlPiB3cm90ZToNCj4gT24gVHVlLCBKdWwgMDUs IDIwMTYgYXQgMTE6MjA6MDdBTSArMDUzMCwgVmlrYXMgQyBTYWpqYW4gd3JvdGU6DQo+PiBJZiBk ZXZtX2FkZF9hY3Rpb24oKSBmYWlscywgd2UgYXJlIGV4cGxpY2l0bHkgY2FsbGluZyB0aGUgY2xl YW51cCB0byANCj4+IGZyZWUgdGhlIHJlc291cmNlcyBhbGxvY2F0ZWQuIFVzZSB0aGUgaGVscGVy IA0KPj4gZGV2bV9hZGRfYWN0aW9uX29yX3Jlc2V0KCkgYW5kIHJldHVybiBkaXJlY3RseSBpbiBj YXNlIG9mIGVycm9yLCANCj4+IHNpbmNlIHRoZSBjbGVhbnVwIGZ1bmN0aW9uIGhhcyBiZWVuIGFs cmVhZHkgY2FsbGVkIGJ5IHRoZSBoZWxwZXIgaWYgdGhlcmUgd2FzIGFueSBlcnJvci4NCj4+DQo+ PiBSZXBvcnRlZC1ieTogU3VkaXAgTXVraGVyamVlIDxzdWRpcG0ubXVraGVyamVlQGdtYWlsLmNv bT4NCj4+IFNpZ25lZC1vZmYtYnk6IFZpa2FzIEMgU2FqamFuIDx2aWthcy5jaGEuc2FqamFuQGhw ZS5jb20+DQo+DQo+IFJldmlld2VkLWJ5OiBKb2hhbm5lcyBUaHVtc2hpcm4gPGp0aHVtc2hpcm5A c3VzZS5kZT4NCj4NCj4gLS0NCj4gSm9oYW5uZXMgVGh1bXNoaXJuICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgU3RvcmFnZQ0KPiBqdGh1bXNoaXJuQHN1c2UuZGUgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICs0OSA5MTEgNzQwNTMgNjg5DQo+IFNVU0UgTElO VVggR21iSCwgTWF4ZmVsZHN0ci4gNSwgOTA0MDkgTsO8cm5iZXJnDQo+IEdGOiBGZWxpeCBJbWVu ZMO2cmZmZXIsIEphbmUgU21pdGhhcmQsIEdyYWhhbSBOb3J0b24gSFJCIDIxMjg0IChBRyANCj4g TsO8cm5iZXJnKSBLZXkgZmluZ2VycHJpbnQgPSBFQzM4IDlDQUIgQzJDNCBGMjVEIDg2MDAgRDBE MCAwMzkzIDk2OUQgDQo+IDJENzYgMDg1MA0K -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c index b891a12..803f395 100644 --- a/drivers/dax/dax.c +++ b/drivers/dax/dax.c @@ -211,11 +211,9 @@ int devm_create_dax_dev(struct dax_region *dax_region, struct resource *res, } dax_dev->dev = dev; - rc = devm_add_action(dax_region->dev, unregister_dax_dev, dev); - if (rc) { - unregister_dax_dev(dev); + rc = devm_add_action_or_reset(dax_region->dev, unregister_dax_dev, dev); + if (rc) return rc; - } return 0; diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c index 55d510e..dfb1685 100644 --- a/drivers/dax/pmem.c +++ b/drivers/dax/pmem.c @@ -102,21 +102,19 @@ static int dax_pmem_probe(struct device *dev) if (rc) return rc; - rc = devm_add_action(dev, dax_pmem_percpu_exit, &dax_pmem->ref); - if (rc) { - dax_pmem_percpu_exit(&dax_pmem->ref); + rc = devm_add_action_or_reset(dev, dax_pmem_percpu_exit, + &dax_pmem->ref); + if (rc) return rc; - } addr = devm_memremap_pages(dev, &res, &dax_pmem->ref, altmap); if (IS_ERR(addr)) return PTR_ERR(addr); - rc = devm_add_action(dev, dax_pmem_percpu_kill, &dax_pmem->ref); - if (rc) { - dax_pmem_percpu_kill(&dax_pmem->ref); + rc = devm_add_action_or_reset(dev, dax_pmem_percpu_kill, + &dax_pmem->ref); + if (rc) return rc; - } nd_region = to_nd_region(dev->parent); dax_region = alloc_dax_region(dev, nd_region->id, &res,
If devm_add_action() fails, we are explicitly calling the cleanup to free the resources allocated. Use the helper devm_add_action_or_reset() and return directly in case of error, since the cleanup function has been already called by the helper if there was any error. Reported-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Signed-off-by: Vikas C Sajjan <vikas.cha.sajjan@hpe.com> --- drivers/dax/dax.c | 6 ++---- drivers/dax/pmem.c | 14 ++++++-------- 2 files changed, 8 insertions(+), 12 deletions(-)