Commit 3bef735a authored Jul 23, 2020 by Chengguang Xu Committed by Linus Torvalds Jul 24, 2020

vfs/xattr: mm/shmem: kernfs: release simple xattr entry in a right way



After commit fdc85222 ("kernfs: kvmalloc xattr value instead of
kmalloc"), simple xattr entry is allocated with kvmalloc() instead of
kmalloc(), so we should release it with kvfree() instead of kfree().

Fixes: fdc85222 ("kernfs: kvmalloc xattr value instead of kmalloc")
Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Hugh Dickins <hughd@google.com>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: Daniel Xu <dxu@dxuuu.xyz>
Cc: Chris Down <chris@chrisdown.name>
Cc: Andreas Dilger <adilger@dilger.ca>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: <stable@vger.kernel.org>	[5.7]
Link: http://lkml.kernel.org/r/20200704051608.15043-1-cgxu519@mykernel.net


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 246c320a

include/linux/xattr.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include <linux/slab.h>
		#include <linux/types.h>
		#include <linux/spinlock.h>
		#include <linux/mm.h>
		#include <uapi/linux/xattr.h>

		struct inode;
		@@ -94,7 +95,7 @@ static inline void simple_xattrs_free(struct simple_xattrs *xattrs)

		list_for_each_entry_safe(xattr, node, &xattrs->head, list) {
		kfree(xattr->name);
		kfree(xattr);
		kvfree(xattr);
		}
		}

mm/shmem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3178,7 +3178,7 @@ static int shmem_initxattrs(struct inode *inode,
		new_xattr->name = kmalloc(XATTR_SECURITY_PREFIX_LEN + len,
		GFP_KERNEL);
		if (!new_xattr->name) {
		kfree(new_xattr);
		kvfree(new_xattr);
		return -ENOMEM;
		}

Admin message