The patch titled
Subject: swapfile: fix name leak in swapoff
has been removed from the -mm tree. Its filename was
swapfile-fix-name-leak-in-swapoff.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Xiaotian Feng <xtfeng@xxxxxxxxx>
Subject: swapfile: fix name leak in swapoff
There's a name leak introduced by 91a27b2 ("vfs: define struct filename
and have getname() return it"). Add the missing putname.
[akpm@xxxxxxxxxxxxxxxxxxxx: cleanup]
Signed-off-by: Xiaotian Feng <dannyfeng@xxxxxxxxxxx>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swapfile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN mm/swapfile.c~swapfile-fix-name-leak-in-swapoff mm/swapfile.c
--- a/mm/swapfile.c~swapfile-fix-name-leak-in-swapoff
+++ a/mm/swapfile.c
@@ -1494,9 +1494,8 @@ SYSCALL_DEFINE1(swapoff, const char __us
BUG_ON(!current->mm);
pathname = getname(specialfile);
- err = PTR_ERR(pathname);
if (IS_ERR(pathname))
- goto out;
+ return PTR_ERR(pathname);
victim = file_open_name(pathname, O_RDWR|O_LARGEFILE, 0);
err = PTR_ERR(victim);
@@ -1608,6 +1607,7 @@ SYSCALL_DEFINE1(swapoff, const char __us
out_dput:
filp_close(victim, NULL);
out:
+ putname(pathname);
return err;
}
_
Patches currently in -mm which might be from xtfeng@xxxxxxxxx are
linux-next.patch
tasklet-ignore-disabled-tasklet-in-tasklet_action.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
