From 04ed5ae79eb5107de5df18db53a0b7dff52caab6 Mon Sep 17 00:00:00 2001 From: Zizhi Wo Date: Mon, 2 Sep 2024 12:20:39 +0800 Subject: [PATCH 1/2] Revert "cifs: Fix pages leak when writedata alloc failed in cifs_write_from_iter()" hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAO0ER -------------------------------- This reverts commit 9f14fd51e077 ("cifs: Fix pages leak when writedata alloc failed in cifs_write_from_iter()"). In cifs_write_from_iter(), pagevec should not be released when it is not initialized. The release should occur only after the pagevec has been properly initialized. Rolled back the improperly adapted patch first. Fixes: 9f14fd51e077 ("cifs: Fix pages leak when writedata alloc failed in cifs_write_from_iter()") Signed-off-by: Zizhi Wo --- fs/cifs/file.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index dc7175b75c26..d908eba024f0 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -2988,9 +2988,6 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from, cifs_uncached_writev_complete); if (!wdata) { rc = -ENOMEM; - for (i = 0; i < nr_pages; i++) - put_page(pagevec[i]); - kvfree(pagevec); add_credits_and_wake_if(server, credits, 0); break; } -- Gitee From 1aa39f67edd948fd180db2076969a3881c4bb62d Mon Sep 17 00:00:00 2001 From: Zhang Xiaoxu Date: Mon, 2 Sep 2024 12:20:40 +0800 Subject: [PATCH 2/2] cifs: Fix pages leak when writedata alloc failed in cifs_write_from_iter() mainline inclusion from mainline-v6.1-rc3 commit f950c85e782f90702468bba8243cc97a8d0d04b0 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAO0ER Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f950c85e782f90702468bba8243cc97a8d0d04b0 -------------------------------- There is a kmemleak when writedata alloc failed: unreferenced object 0xffff888175ae4000 (size 4096): comm "dd", pid 19419, jiffies 4296028749 (age 739.396s) hex dump (first 32 bytes): 80 02 b0 04 00 ea ff ff c0 02 b0 04 00 ea ff ff ................ 80 22 4c 04 00 ea ff ff c0 22 4c 04 00 ea ff ff ."L......"L..... backtrace: [<0000000072fdbb86>] __kmalloc_node+0x50/0x150 [<0000000039faf56f>] __iov_iter_get_pages_alloc+0x605/0xdd0 [<00000000f862a9d4>] iov_iter_get_pages_alloc2+0x3b/0x80 [<000000008f226067>] cifs_write_from_iter+0x2ae/0xe40 [<000000001f78f2f1>] __cifs_writev+0x337/0x5c0 [<00000000257fcef5>] vfs_write+0x503/0x690 [<000000008778a238>] ksys_write+0xb9/0x150 [<00000000ed82047c>] do_syscall_64+0x35/0x80 [<000000003365551d>] entry_SYSCALL_64_after_hwframe+0x46/0xb0 __iov_iter_get_pages_alloc+0x605/0xdd0 is: want_pages_array at lib/iov_iter.c:1304 (inlined by) __iov_iter_get_pages_alloc at lib/iov_iter.c:1457 If writedata allocate failed, the pages and pagevec should be cleanup. Fixes: 8c5f9c1ab7cb ("CIFS: Add support for direct I/O write") Reviewed-by: Paulo Alcantara (SUSE) Signed-off-by: Zhang Xiaoxu Signed-off-by: Steve French Conflicts: fs/cifs/file.c [It can be directly adapted, but the position is incorrect, and the patch is re-adjusted.] Signed-off-by: Zizhi Wo --- fs/cifs/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index d908eba024f0..da70af2af115 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -2971,6 +2971,9 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from, cifs_uncached_writev_complete); if (!wdata) { rc = -ENOMEM; + for (i = 0; i < nr_pages; i++) + put_page(pagevec[i]); + kvfree(pagevec); add_credits_and_wake_if(server, credits, 0); break; } -- Gitee