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

Commit 0c027bc3 authored by Abdul Hussain's avatar Abdul Hussain Committed by Greg Kroah-Hartman
Browse files

Staging: lustre: Use memdup_user rather than duplicating its implementation 



This patch uses memdup_user rather than duplicating its implementation

Signed-off-by: default avatarAbdul Hussain <habdul@visteon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d46bc00c

drivers/staging/lustre/lustre/llite/file.c

+6 −16
Original line number Diff line number Diff line
@@ -2361,14 +2361,9 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		struct hsm_state_set	*hss;

		int			 rc;



		hss = kzalloc(sizeof(*hss), GFP_NOFS);

		if (!hss)

			return -ENOMEM;



		if (copy_from_user(hss, (char *)arg, sizeof(*hss))) {

			kfree(hss);

			return -EFAULT;

		}

		hss = memdup_user((char *)arg, sizeof(*hss));

		if (IS_ERR(hss))

			return PTR_ERR(hss);



		rc = ll_hsm_state_set(inode, hss);
@@ -2488,14 +2483,9 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case LL_IOC_HSM_IMPORT: {

		struct hsm_user_import *hui;



		hui = kzalloc(sizeof(*hui), GFP_NOFS);

		if (!hui)

			return -ENOMEM;



		if (copy_from_user(hui, (void *)arg, sizeof(*hui))) {

			kfree(hui);

			return -EFAULT;

		}

		hui = memdup_user((void *)arg, sizeof(*hui));

		if (IS_ERR(hui))

			return PTR_ERR(hui);



		rc = ll_hsm_import(inode, file, hui);