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

Commit b4e28030 authored by Geliang Tang's avatar Geliang Tang Committed by Mimi Zohar
Browse files

ima: use memdup_user_nul 



Use memdup_user_nul() helper instead of open-coding to simplify the
code.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
parent 5d659f28

security/integrity/ima/ima_fs.c

+4 −9
Original line number Diff line number Diff line
@@ -323,16 +323,11 @@ static ssize_t ima_write_policy(struct file *file, const char __user *buf, 
	if (*ppos != 0)

		goto out;



	result = -ENOMEM;

	data = kmalloc(datalen + 1, GFP_KERNEL);

	if (!data)

	data = memdup_user_nul(buf, datalen);

	if (IS_ERR(data)) {

		result = PTR_ERR(data);

		goto out;



	*(data + datalen) = '\0';



	result = -EFAULT;

	if (copy_from_user(data, buf, datalen))

		goto out_free;

	}



	result = mutex_lock_interruptible(&ima_write_mutex);

	if (result < 0)