evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

md: remove unnecessary 'buf' from get_bitmap_file.

Browse source 
'buf' is only used because d_path fills from the end of the
buffer instead of from the start.
We don't need a separate buf to handle that, we just need to use
memmove() to move the string to the start.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2014-12-15 12:57:00 +11:00
parent 758bfc8abf
commit f4ad3d38d4
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/md/md.c
View file

@ -5502,7 +5502,7 @@ static int get_array_info(struct mddev *mddev, void __user *arg)
static int get_bitmap_file(struct mddev *mddev, void __user * arg) static int get_bitmap_file(struct mddev *mddev, void __user * arg)
{ {
mdu_bitmap_file_t *file = NULL; /* too big for stack allocation */ mdu_bitmap_file_t *file = NULL; /* too big for stack allocation */
char *ptr, *buf = NULL; char *ptr;
int err = -ENOMEM; int err = -ENOMEM;
file = kmalloc(sizeof(*file), GFP_NOIO); file = kmalloc(sizeof(*file), GFP_NOIO);
@ -5516,23 +5516,19 @@ static int get_bitmap_file(struct mddev *mddev, void __user * arg)
goto copy_out; goto copy_out;
} }
buf = kmalloc(sizeof(file->pathname), GFP_KERNEL);
if (!buf)
goto out;
ptr = d_path(&mddev->bitmap->storage.file->f_path, ptr = d_path(&mddev->bitmap->storage.file->f_path,
buf, sizeof(file->pathname)); file->pathname, sizeof(file->pathname));
if (IS_ERR(ptr)) if (IS_ERR(ptr))
goto out; goto out;
strcpy(file->pathname, ptr); memmove(file->pathname, ptr,
sizeof(file->pathname)-(ptr-file->pathname));
copy_out: copy_out:
err = 0; err = 0;
if (copy_to_user(arg, file, sizeof(*file))) if (copy_to_user(arg, file, sizeof(*file)))
err = -EFAULT; err = -EFAULT;
out: out:
kfree(buf);
kfree(file); kfree(file);
return err; return err;
} }