* [PATCH] NFS: put net in case of idr allocation failure
@ 2012-08-20 13:43 Stanislav Kinsbursky
2012-08-20 16:11 ` Myklebust, Trond
0 siblings, 1 reply; 3+ messages in thread
From: Stanislav Kinsbursky @ 2012-08-20 13:43 UTC (permalink / raw)
To: Trond.Myklebust; +Cc: bfields, linux-nfs, linux-kernel, devel
Put net reference we got in nfs_alloc_client() on error path.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
fs/nfs/nfs4client.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index cbcdfaf..b895629 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -74,6 +74,7 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)
return clp;
error:
+ put_net(clp->cl_net);
kfree(clp);
return ERR_PTR(err);
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] NFS: put net in case of idr allocation failure
2012-08-20 13:43 [PATCH] NFS: put net in case of idr allocation failure Stanislav Kinsbursky
@ 2012-08-20 16:11 ` Myklebust, Trond
2012-08-20 16:14 ` Stanislav Kinsbursky
0 siblings, 1 reply; 3+ messages in thread
From: Myklebust, Trond @ 2012-08-20 16:11 UTC (permalink / raw)
To: Stanislav Kinsbursky
Cc: bfields@fieldses.org, linux-nfs@vger.kernel.org,
linux-kernel@vger.kernel.org, devel@openvz.org
T24gTW9uLCAyMDEyLTA4LTIwIGF0IDE3OjQzICswNDAwLCBTdGFuaXNsYXYgS2luc2J1cnNreSB3
cm90ZToNCj4gUHV0IG5ldCByZWZlcmVuY2Ugd2UgZ290IGluIG5mc19hbGxvY19jbGllbnQoKSBv
biBlcnJvciBwYXRoLg0KPiANCj4gU2lnbmVkLW9mZi1ieTogU3RhbmlzbGF2IEtpbnNidXJza3kg
PHNraW5zYnVyc2t5QHBhcmFsbGVscy5jb20+DQo+IC0tLQ0KPiAgZnMvbmZzL25mczRjbGllbnQu
YyB8ICAgIDEgKw0KPiAgMSBmaWxlcyBjaGFuZ2VkLCAxIGluc2VydGlvbnMoKyksIDAgZGVsZXRp
b25zKC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZnMvbmZzL25mczRjbGllbnQuYyBiL2ZzL25mcy9u
ZnM0Y2xpZW50LmMNCj4gaW5kZXggY2JjZGZhZi4uYjg5NTYyOSAxMDA2NDQNCj4gLS0tIGEvZnMv
bmZzL25mczRjbGllbnQuYw0KPiArKysgYi9mcy9uZnMvbmZzNGNsaWVudC5jDQo+IEBAIC03NCw2
ICs3NCw3IEBAIHN0cnVjdCBuZnNfY2xpZW50ICpuZnM0X2FsbG9jX2NsaWVudChjb25zdCBzdHJ1
Y3QgbmZzX2NsaWVudF9pbml0ZGF0YSAqY2xfaW5pdCkNCj4gIAlyZXR1cm4gY2xwOw0KPiAgDQo+
ICBlcnJvcjoNCj4gKwlwdXRfbmV0KGNscC0+Y2xfbmV0KTsNCj4gIAlrZnJlZShjbHApOw0KPiAg
CXJldHVybiBFUlJfUFRSKGVycik7DQo+ICB9DQoNCg0KTm8sIHRoYXQgaXNuJ3QgYW55d2hlcmUg
bmVhciBzdWZmaWNpZW50Lg0KDQpUaGUgY29ycmVjdCB0aGluZyB0byBkbyBoZXJlIGlzIHRvIHJl
cGxhY2UgdGhlIGtmcmVlIHdpdGggYSBjYWxsIHRvDQpuZnNfZnJlZV9jbGllbnQoKSwgd2hpY2gg
d2lsbCBhbHNvIGNsZWFuIHVwIHRoZSBhbGxvY2F0aW9uIG9mDQpjbF9ob3N0bmFtZSwgcHV0IHRo
ZSBtb2R1bGUsIGV0Yy4NCg0KLS0gDQpUcm9uZCBNeWtsZWJ1c3QNCkxpbnV4IE5GUyBjbGllbnQg
bWFpbnRhaW5lcg0KDQpOZXRBcHANClRyb25kLk15a2xlYnVzdEBuZXRhcHAuY29tDQp3d3cubmV0
YXBwLmNvbQ0KDQo=
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] NFS: put net in case of idr allocation failure
2012-08-20 16:11 ` Myklebust, Trond
@ 2012-08-20 16:14 ` Stanislav Kinsbursky
0 siblings, 0 replies; 3+ messages in thread
From: Stanislav Kinsbursky @ 2012-08-20 16:14 UTC (permalink / raw)
To: Myklebust, Trond
Cc: bfields@fieldses.org, linux-nfs@vger.kernel.org,
linux-kernel@vger.kernel.org, devel@openvz.org
20.08.2012 20:11, Myklebust, Trond пишет:
> On Mon, 2012-08-20 at 17:43 +0400, Stanislav Kinsbursky wrote:
>> Put net reference we got in nfs_alloc_client() on error path.
>>
>> Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
>> ---
>> fs/nfs/nfs4client.c | 1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
>> index cbcdfaf..b895629 100644
>> --- a/fs/nfs/nfs4client.c
>> +++ b/fs/nfs/nfs4client.c
>> @@ -74,6 +74,7 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)
>> return clp;
>>
>> error:
>> + put_net(clp->cl_net);
>> kfree(clp);
>> return ERR_PTR(err);
>> }
>
>
> No, that isn't anywhere near sufficient.
>
> The correct thing to do here is to replace the kfree with a call to
> nfs_free_client(), which will also clean up the allocation of
> cl_hostname, put the module, etc.
>
Sure, you are right.
--
Best regards,
Stanislav Kinsbursky
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-20 16:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-20 13:43 [PATCH] NFS: put net in case of idr allocation failure Stanislav Kinsbursky
2012-08-20 16:11 ` Myklebust, Trond
2012-08-20 16:14 ` Stanislav Kinsbursky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).