Commit 8e148f56 authored by Zou Wei's avatar Zou Wei Committed by Zheng Zengkai
Browse files

crypto: hisilicon - switch to memdup_user_nul() 

mainline inclusion
from mainline-master
commit e7662cb9
category: feature
bugzilla: 173981
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e7662cb9e99ef0fd15b8a0dcb3e5d7b32f9812d4



----------------------------------------------------------------------

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

v1-->v2:
   fixed patch title error
v2-->v3:
   return the actual error

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZou Wei <zou_wei@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarMingqiang Ling <lingmingqiang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 470eb894

drivers/crypto/hisilicon/qm.c

+3 −10
Original line number Diff line number Diff line
@@ -1603,16 +1603,9 @@ static ssize_t qm_cmd_write(struct file *filp, const char __user *buffer, 
	if (count > QM_DBG_WRITE_LEN)

		return -ENOSPC;



	cmd_buf = kzalloc(count + 1, GFP_KERNEL);

	if (!cmd_buf)

		return -ENOMEM;



	if (copy_from_user(cmd_buf, buffer, count)) {

		kfree(cmd_buf);

		return -EFAULT;

	}



	cmd_buf[count] = '\0';

	cmd_buf = memdup_user_nul(buffer, count);

	if (IS_ERR(cmd_buf))

		return PTR_ERR(cmd_buf);



	cmd_buf_tmp = strchr(cmd_buf, '\n');

	if (cmd_buf_tmp) {