Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d08d7b7 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

fs/xattr.c:listxattr(): fall back to vmalloc() if kmalloc() failed 



This allocation can be as large as 64k.  As David points out, "falling
back to vmalloc here is much better solution than failing to retreive
the attribute - it will work no matter how fragmented memory gets.  That
means we don't get incomplete backups occurring after days or months of
uptime and successful backups".

Cc: Dave Chinner <david@fromorbit.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: David Rientjes <rientjes@google.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 703bf2d1

fs/xattr.c

+13 −4
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ 
#include <linux/export.h>

#include <linux/fsnotify.h>

#include <linux/audit.h>

#include <asm/uaccess.h>

#include <linux/vmalloc.h>



#include <asm/uaccess.h>



/*

 * Check permissions for extended attribute access.  This is a bit complicated
@@ -492,13 +493,18 @@ listxattr(struct dentry *d, char __user *list, size_t size) 
{

	ssize_t error;

	char *klist = NULL;

	char *vlist = NULL;	/* If non-NULL, we used vmalloc() */



	if (size) {

		if (size > XATTR_LIST_MAX)

			size = XATTR_LIST_MAX;

		klist = kmalloc(size, __GFP_NOWARN | GFP_KERNEL);

		if (!klist)

		if (!klist) {

			vlist = vmalloc(size);

			if (!vlist)

				return -ENOMEM;

			klist = vlist;

		}

	}



	error = vfs_listxattr(d, klist, size);
@@ -510,6 +516,9 @@ listxattr(struct dentry *d, char __user *list, size_t size) 
		   than XATTR_LIST_MAX bytes. Not possible. */

		error = -E2BIG;

	}

	if (vlist)

		vfree(vlist);

	else

		kfree(klist);

	return error;

}