Skip to content

Commit ca08d0e

Browse files
z00467499smfrench
authored andcommitted
cifs: Fix memory leak on the deferred close
xfstests on smb21 report kmemleak as below: unreferenced object 0xffff8881767d6200 (size 64): comm "xfs_io", pid 1284, jiffies 4294777434 (age 20.789s) hex dump (first 32 bytes): 80 5a d0 11 81 88 ff ff 78 8a aa 63 81 88 ff ff .Z......x..c.... 00 71 99 76 81 88 ff ff 00 00 00 00 00 00 00 00 .q.v............ backtrace: [<00000000ad04e6ea>] cifs_close+0x92/0x2c0 [<0000000028b93c82>] __fput+0xff/0x3f0 [<00000000d8116851>] task_work_run+0x85/0xc0 [<0000000027e14f9e>] do_exit+0x5e5/0x1240 [<00000000fb492b95>] do_group_exit+0x58/0xe0 [<00000000129a32d9>] __x64_sys_exit_group+0x28/0x30 [<00000000e3f7d8e9>] do_syscall_64+0x35/0x80 [<00000000102e8a0b>] entry_SYSCALL_64_after_hwframe+0x46/0xb0 When cancel the deferred close work, we should also cleanup the struct cifs_deferred_close. Fixes: 9e99275 ("cifs: Call close synchronously during unlink/rename/lease break.") Fixes: e3fc065 ("cifs: Deferred close performance improvements") Cc: [email protected] Reviewed-by: Shyam Prasad N <[email protected]> Signed-off-by: Zhang Xiaoxu <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 400d0ad commit ca08d0e

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

fs/cifs/misc.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,8 @@ cifs_close_deferred_file(struct cifsInodeInfo *cifs_inode)
737737
list_for_each_entry(cfile, &cifs_inode->openFileList, flist) {
738738
if (delayed_work_pending(&cfile->deferred)) {
739739
if (cancel_delayed_work(&cfile->deferred)) {
740+
cifs_del_deferred_close(cfile);
741+
740742
tmp_list = kmalloc(sizeof(struct file_list), GFP_ATOMIC);
741743
if (tmp_list == NULL)
742744
break;
@@ -766,6 +768,8 @@ cifs_close_all_deferred_files(struct cifs_tcon *tcon)
766768
list_for_each_entry(cfile, &tcon->openFileList, tlist) {
767769
if (delayed_work_pending(&cfile->deferred)) {
768770
if (cancel_delayed_work(&cfile->deferred)) {
771+
cifs_del_deferred_close(cfile);
772+
769773
tmp_list = kmalloc(sizeof(struct file_list), GFP_ATOMIC);
770774
if (tmp_list == NULL)
771775
break;
@@ -799,6 +803,8 @@ cifs_close_deferred_file_under_dentry(struct cifs_tcon *tcon, const char *path)
799803
if (strstr(full_path, path)) {
800804
if (delayed_work_pending(&cfile->deferred)) {
801805
if (cancel_delayed_work(&cfile->deferred)) {
806+
cifs_del_deferred_close(cfile);
807+
802808
tmp_list = kmalloc(sizeof(struct file_list), GFP_ATOMIC);
803809
if (tmp_list == NULL)
804810
break;

0 commit comments

Comments
 (0)