| Message ID | 87885798-493b-0d5a-b64e-f01e927ddeeb@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
T24gTW9uLCAyMDE3LTAzLTA2IGF0IDIyOjI5ICswODAwLCBLaW5nbG9uZyBNZWUgd3JvdGU6DQo+ IEJlY2F1c2UgbmZzNF9vcGVuZGF0YV9hY2Nlc3MoKSBoYXMgY2xvc2UgdGhlIHN0YXRlIHdoZW4g YWNjZXNzIGlzDQo+IGRlbmllZCwNCj4gc28gdGhlIHN0YXRlIGlzbid0IGxlYWsuDQo+IFJhdGhl ciB0aGFuIHJldmVydCB0aGUgY29tbWl0IGE5NzRkZWVlNDcsIEknZCBsaWtlIGNsZWFuIHRoZSBz dHJhbmdlDQo+IHN0YXRlIGNsb3NlLg0KPiANCj4gWyAxNjE1LjA5NDIxOF0gLS0tLS0tLS0tLS0t WyBjdXQgaGVyZSBdLS0tLS0tLS0tLS0tDQo+IFsgMTYxNS4wOTQ2MDddIFdBUk5JTkc6IENQVTog MCBQSUQ6IDIzNzAyIGF0IGxpYi9saXN0X2RlYnVnLmM6MzENCj4gX19saXN0X2FkZF92YWxpZCsw eDhlLzB4YTANCj4gWyAxNjE1LjA5NDkxM10gbGlzdF9hZGQgZG91YmxlIGFkZDogbmV3PWZmZmY5 ZDc5MDFkOWY2MDgsDQo+IHByZXY9ZmZmZjlkNzkwMWQ5ZjYwOCwgbmV4dD1mZmZmOWQ3OTAxZWU4 ZGQwLg0KPiBbIDE2MTUuMDk1NDU4XSBNb2R1bGVzIGxpbmtlZCBpbjogbmZzdjQoRSkgbmZzKEUp IG5mc2QoRSkgdHVuIGJyaWRnZQ0KPiBzdHAgbGxjIGZ1c2UgaXBfc2V0IG5mbmV0bGluayB2bXdf dnNvY2tfdm1jaV90cmFuc3BvcnQgdnNvY2sgZjJmcw0KPiBzbmRfc2VxX21pZGkgc25kX3NlcV9t aWRpX2V2ZW50IGZzY3J5cHRvIGNvcmV0ZW1wIHBwZGV2DQo+IGNyY3QxMGRpZl9wY2xtdWwgY3Jj MzJfcGNsbXVsIGdoYXNoX2NsbXVsbmlfaW50ZWwgaW50ZWxfcmFwbF9wZXJmDQo+IHZtd19iYWxs b29uIHNuZF9lbnMxMzcxIGpveWRldiBnYW1lcG9ydCBzbmRfYWM5N19jb2RlYyBhYzk3X2J1cw0K PiBzbmRfc2VxIHNuZF9wY20gc25kX3Jhd21pZGkgc25kX3RpbWVyIHNuZF9zZXFfZGV2aWNlIHNu ZCBzb3VuZGNvcmUNCj4gbmZpdCBwYXJwb3J0X3BjIHBhcnBvcnQgYWNwaV9jcHVmcmVxIHRwbV90 aXMgdHBtX3Rpc19jb3JlIHRwbQ0KPiBpMmNfcGlpeDQgdm13X3ZtY2kgc2hwY2hwIGF1dGhfcnBj Z3NzIG5mc19hY2wgbG9ja2QoRSkgZ3JhY2UNCj4gc3VucnBjKEUpIHhmcyBsaWJjcmMzMmMgdm13 Z2Z4IGRybV9rbXNfaGVscGVyIHR0bSBkcm0gY3JjMzJjX2ludGVsDQo+IG1wdHNwaSBlMTAwMCBz ZXJpb19yYXcgc2NzaV90cmFuc3BvcnRfc3BpIG1wdHNjc2loIG1wdGJhc2UNCj4gYXRhX2dlbmVy aWMgcGF0YV9hY3BpIGZqZXMgW2xhc3QgdW5sb2FkZWQ6IG5mc10NCj4gWyAxNjE1LjA5NzY2M10g Q1BVOiAwIFBJRDogMjM3MDIgQ29tbTogZnN0ZXN0IFRhaW50ZWQ6DQo+IEfCoMKgwqDCoMKgwqDC oMKgV8KgwqDCoEXCoMKgwqA0LjExLjAtcmMxKyAjNTE3DQo+IFsgMTYxNS4wOTgwMTVdIEhhcmR3 YXJlIG5hbWU6IFZNd2FyZSwgSW5jLiBWTXdhcmUgVmlydHVhbA0KPiBQbGF0Zm9ybS80NDBCWCBE ZXNrdG9wIFJlZmVyZW5jZSBQbGF0Zm9ybSwgQklPUyA2LjAwIDA3LzAyLzIwMTUNCj4gWyAxNjE1 LjA5ODgwN10gQ2FsbCBUcmFjZToNCj4gWyAxNjE1LjA5OTE4M13CoMKgZHVtcF9zdGFjaysweDYz LzB4ODYNCj4gWyAxNjE1LjA5OTU3OF3CoMKgX193YXJuKzB4Y2IvMHhmMA0KPiBbIDE2MTUuMDk5 OTY3XcKgwqB3YXJuX3Nsb3dwYXRoX2ZtdCsweDVmLzB4ODANCj4gWyAxNjE1LjEwMDM3MF3CoMKg X19saXN0X2FkZF92YWxpZCsweDhlLzB4YTANCj4gWyAxNjE1LjEwMDc2MF3CoMKgbmZzNF9wdXRf c3RhdGVfb3duZXIrMHg3NS8weGMwIFtuZnN2NF0NCj4gWyAxNjE1LjEwMTEzNl3CoMKgX19uZnM0 X2Nsb3NlKzB4MTA5LzB4MTQwIFtuZnN2NF0NCj4gWyAxNjE1LjEwMTUyNF3CoMKgbmZzNF9jbG9z ZV9zdGF0ZSsweDE1LzB4MjAgW25mc3Y0XQ0KPiBbIDE2MTUuMTAxOTQ5XcKgwqBuZnM0X2Nsb3Nl X2NvbnRleHQrMHgyMS8weDMwIFtuZnN2NF0NCj4gWyAxNjE1LjEwMjY5MV3CoMKgX19wdXRfbmZz X29wZW5fY29udGV4dCsweGI4LzB4MTEwIFtuZnNdDQo+IFsgMTYxNS4xMDMxNTVdwqDCoHB1dF9u ZnNfb3Blbl9jb250ZXh0KzB4MTAvMHgyMCBbbmZzXQ0KPiBbIDE2MTUuMTAzNTg2XcKgwqBuZnM0 X2ZpbGVfb3BlbisweDEzYi8weDI2MCBbbmZzdjRdDQo+IFsgMTYxNS4xMDM5NzhdwqDCoGRvX2Rl bnRyeV9vcGVuKzB4MjBhLzB4MmYwDQo+IFsgMTYxNS4xMDQzNjldwqDCoD8gbmZzNF9jb3B5X2Zp bGVfcmFuZ2UrMHgzMC8weDMwIFtuZnN2NF0NCj4gWyAxNjE1LjEwNDczOV3CoMKgdmZzX29wZW4r MHg0Yy8weDcwDQo+IFsgMTYxNS4xMDUxMDZdwqDCoD8gbWF5X29wZW4rMHg1YS8weDEwMA0KPiBb IDE2MTUuMTA1NDY5XcKgwqBwYXRoX29wZW5hdCsweDYyMy8weDE0MjANCj4gWyAxNjE1LjEwNTgy M13CoMKgZG9fZmlscF9vcGVuKzB4OTEvMHgxMDANCj4gWyAxNjE1LjEwNjE3NF3CoMKgPyBfX2Fs bG9jX2ZkKzB4M2YvMHgxNzANCj4gWyAxNjE1LjEwNjU2OF3CoMKgZG9fc3lzX29wZW4rMHgxMzAv MHgyMjANCj4gWyAxNjE1LjEwNjkyMF3CoMKgPyBfX3B1dF9jcmVkKzB4M2QvMHg1MA0KPiBbIDE2 MTUuMTA3MjU2XcKgwqBTeVNfb3BlbisweDFlLzB4MjANCj4gWyAxNjE1LjEwNzU4OF3CoMKgZW50 cnlfU1lTQ0FMTF82NF9mYXN0cGF0aCsweDFhLzB4YTkNCj4gWyAxNjE1LjEwNzkyMl0gUklQOiAw MDMzOjB4N2ZhYjU5OTA2OWIwDQo+IFsgMTYxNS4xMDgyNDddIFJTUDogMDAyYjowMDAwN2ZmY2Yw NjAwZDc4IEVGTEFHUzogMDAwMDAyNDYgT1JJR19SQVg6DQo+IDAwMDAwMDAwMDAwMDAwMDINCj4g WyAxNjE1LjEwODU3NV0gUkFYOiBmZmZmZmZmZmZmZmZmZmRhIFJCWDogMDAwMDdmYWI1OWJjZmFl MCBSQ1g6DQo+IDAwMDA3ZmFiNTk5MDY5YjANCj4gWyAxNjE1LjEwODg5Nl0gUkRYOiAwMDAwMDAw MDAwMDAwMjAwIFJTSTogMDAwMDAwMDAwMDAwMDIwMCBSREk6DQo+IDAwMDA3ZmZjZjA2MDI1NWUN Cj4gWyAxNjE1LjEwOTIxMV0gUkJQOiAwMDAwMDAwMDAwMDQwMDEwIFIwODogMDAwMDAwMDAwMDAw MDAwMCBSMDk6DQo+IDAwMDAwMDAwMDAwMDAwMTYNCj4gWyAxNjE1LjEwOTUxNV0gUjEwOiAwMDAw MDAwMDAwMDAwNmExIFIxMTogMDAwMDAwMDAwMDAwMDI0NiBSMTI6DQo+IDAwMDAwMDAwMDAwNDEw MDANCj4gWyAxNjE1LjEwOTgwNl0gUjEzOiAwMDAwMDAwMDAwMDQwMDEwIFIxNDogMDAwMDAwMDAw MDAwMTAwMCBSMTU6DQo+IDAwMDAwMDAwMDAwMDI3MTANCj4gWyAxNjE1LjExMDE1Ml0gLS0tWyBl bmQgdHJhY2UgOTZlZDYzYjEzMDZiZjJmMyBdLS0tDQo+IA0KPiBGaXhlczogYTk3NGRlZWU0NyAo Ik5GU3Y0OiBGaXggbWVtb3J5IGFuZCBzdGF0ZSBsZWFrIGluLi4uIikNCj4gU2lnbmVkLW9mZi1i eTogS2luZ2xvbmcgTWVlIDxraW5nbG9uZ21lZUBnbWFpbC5jb20+DQo+IC0tLQ0KPiDCoGZzL25m cy9uZnM0cHJvYy5jIHwgMiAtLQ0KPiDCoDEgZmlsZSBjaGFuZ2VkLCAyIGRlbGV0aW9ucygtKQ0K PiANCj4gZGlmZiAtLWdpdCBhL2ZzL25mcy9uZnM0cHJvYy5jIGIvZnMvbmZzL25mczRwcm9jLmMN Cj4gaW5kZXggMWIxODM2OC4uYzFmNTM2OSAxMDA2NDQNCj4gLS0tIGEvZnMvbmZzL25mczRwcm9j LmMNCj4gKysrIGIvZnMvbmZzL25mczRwcm9jLmMNCj4gQEAgLTIyNTgsOCArMjI1OCw2IEBAIHN0 YXRpYyBpbnQgbmZzNF9vcGVuZGF0YV9hY2Nlc3Moc3RydWN0IHJwY19jcmVkDQo+ICpjcmVkLA0K PiDCoAlpZiAoKG1hc2sgJiB+Y2FjaGUubWFzayAmIChNQVlfUkVBRCB8IE1BWV9FWEVDKSkgPT0g MCkNCj4gwqAJCXJldHVybiAwOw0KPiDCoA0KPiAtCS8qIGV2ZW4gdGhvdWdoIE9QRU4gc3VjY2Vl ZGVkLCBhY2Nlc3MgaXMgZGVuaWVkLiBDbG9zZSB0aGUNCj4gZmlsZSAqLw0KPiAtCW5mczRfY2xv c2Vfc3RhdGUoc3RhdGUsIGZtb2RlKTsNCj4gwqAJcmV0dXJuIC1FQUNDRVM7DQo+IMKgfQ0KPiDC oA0KDQpMb29rcyBnb29kLg0KDQotLSANClRyb25kIE15a2xlYnVzdA0KTGludXggTkZTIGNsaWVu dCBtYWludGFpbmVyLCBQcmltYXJ5RGF0YQ0KdHJvbmQubXlrbGVidXN0QHByaW1hcnlkYXRhLmNv bQ0K -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" 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/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1b18368..c1f5369 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2258,8 +2258,6 @@ static int nfs4_opendata_access(struct rpc_cred *cred, if ((mask & ~cache.mask & (MAY_READ | MAY_EXEC)) == 0) return 0; - /* even though OPEN succeeded, access is denied. Close the file */ - nfs4_close_state(state, fmode); return -EACCES; }
Because nfs4_opendata_access() has close the state when access is denied, so the state isn't leak. Rather than revert the commit a974deee47, I'd like clean the strange state close. [ 1615.094218] ------------[ cut here ]------------ [ 1615.094607] WARNING: CPU: 0 PID: 23702 at lib/list_debug.c:31 __list_add_valid+0x8e/0xa0 [ 1615.094913] list_add double add: new=ffff9d7901d9f608, prev=ffff9d7901d9f608, next=ffff9d7901ee8dd0. [ 1615.095458] Modules linked in: nfsv4(E) nfs(E) nfsd(E) tun bridge stp llc fuse ip_set nfnetlink vmw_vsock_vmci_transport vsock f2fs snd_seq_midi snd_seq_midi_event fscrypto coretemp ppdev crct10dif_pclmul crc32_pclmul ghash_clmulni_intel intel_rapl_perf vmw_balloon snd_ens1371 joydev gameport snd_ac97_codec ac97_bus snd_seq snd_pcm snd_rawmidi snd_timer snd_seq_device snd soundcore nfit parport_pc parport acpi_cpufreq tpm_tis tpm_tis_core tpm i2c_piix4 vmw_vmci shpchp auth_rpcgss nfs_acl lockd(E) grace sunrpc(E) xfs libcrc32c vmwgfx drm_kms_helper ttm drm crc32c_intel mptspi e1000 serio_raw scsi_transport_spi mptscsih mptbase ata_generic pata_acpi fjes [last unloaded: nfs] [ 1615.097663] CPU: 0 PID: 23702 Comm: fstest Tainted: G W E 4.11.0-rc1+ #517 [ 1615.098015] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/02/2015 [ 1615.098807] Call Trace: [ 1615.099183] dump_stack+0x63/0x86 [ 1615.099578] __warn+0xcb/0xf0 [ 1615.099967] warn_slowpath_fmt+0x5f/0x80 [ 1615.100370] __list_add_valid+0x8e/0xa0 [ 1615.100760] nfs4_put_state_owner+0x75/0xc0 [nfsv4] [ 1615.101136] __nfs4_close+0x109/0x140 [nfsv4] [ 1615.101524] nfs4_close_state+0x15/0x20 [nfsv4] [ 1615.101949] nfs4_close_context+0x21/0x30 [nfsv4] [ 1615.102691] __put_nfs_open_context+0xb8/0x110 [nfs] [ 1615.103155] put_nfs_open_context+0x10/0x20 [nfs] [ 1615.103586] nfs4_file_open+0x13b/0x260 [nfsv4] [ 1615.103978] do_dentry_open+0x20a/0x2f0 [ 1615.104369] ? nfs4_copy_file_range+0x30/0x30 [nfsv4] [ 1615.104739] vfs_open+0x4c/0x70 [ 1615.105106] ? may_open+0x5a/0x100 [ 1615.105469] path_openat+0x623/0x1420 [ 1615.105823] do_filp_open+0x91/0x100 [ 1615.106174] ? __alloc_fd+0x3f/0x170 [ 1615.106568] do_sys_open+0x130/0x220 [ 1615.106920] ? __put_cred+0x3d/0x50 [ 1615.107256] SyS_open+0x1e/0x20 [ 1615.107588] entry_SYSCALL_64_fastpath+0x1a/0xa9 [ 1615.107922] RIP: 0033:0x7fab599069b0 [ 1615.108247] RSP: 002b:00007ffcf0600d78 EFLAGS: 00000246 ORIG_RAX: 0000000000000002 [ 1615.108575] RAX: ffffffffffffffda RBX: 00007fab59bcfae0 RCX: 00007fab599069b0 [ 1615.108896] RDX: 0000000000000200 RSI: 0000000000000200 RDI: 00007ffcf060255e [ 1615.109211] RBP: 0000000000040010 R08: 0000000000000000 R09: 0000000000000016 [ 1615.109515] R10: 00000000000006a1 R11: 0000000000000246 R12: 0000000000041000 [ 1615.109806] R13: 0000000000040010 R14: 0000000000001000 R15: 0000000000002710 [ 1615.110152] ---[ end trace 96ed63b1306bf2f3 ]--- Fixes: a974deee47 ("NFSv4: Fix memory and state leak in...") Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> --- fs/nfs/nfs4proc.c | 2 -- 1 file changed, 2 deletions(-)