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

Commit c6c7a170 authored by Tobin C Harding's avatar Tobin C Harding Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: kzalloc/copy_to_user to memdup_user 



kzalloc call followed by copy_to_user can be replaced by call to memdup_user.

Signed-off-by: default avatarTobin C Harding <me@tobin.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db3c16cd

drivers/staging/lustre/lustre/llite/dir.c

+3 −9
Original line number Diff line number Diff line
@@ -1076,17 +1076,11 @@ static int copy_and_ioctl(int cmd, struct obd_export *exp, 
	void *copy;

	int rc;



	copy = kzalloc(size, GFP_NOFS);

	if (!copy)

		return -ENOMEM;



	if (copy_from_user(copy, data, size)) {

		rc = -EFAULT;

		goto out;

	}

	copy = memdup_user(data, size);

	if (IS_ERR(copy))

		return PTR_ERR(copy);



	rc = obd_iocontrol(cmd, exp, size, copy, NULL);

out:

	kfree(copy);



	return rc;