Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1637528

Re: [PATCH] ima: use memdup_user_nul

Show all headers | View raw

On Sat, 2017-05-06 at 23:40 +0800, Geliang Tang wrote:
> Use memdup_user_nul() helper instead of open-coding to simplify the
> code.
> 
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>

Thanks, this patch will be queued.

Mimi

> ---
>  security/integrity/ima/ima_fs.c | 13 ++++---------
>  1 file changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
> index ca303e5..ad491c5 100644
> --- a/security/integrity/ima/ima_fs.c
> +++ b/security/integrity/ima/ima_fs.c
> @@ -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)

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] drm/i915: use memdup_user_nul Geliang Tang <geliangtang@gmail.com> - 2017-05-06 17:50 +0200
  [PATCH] ima: use memdup_user_nul Geliang Tang <geliangtang@gmail.com> - 2017-05-06 17:50 +0200
    Re: [PATCH] ima: use memdup_user_nul Mimi Zohar <zohar@linux.vnet.ibm.com> - 2017-05-08 17:50 +0200
  [PATCH] platform/x86: toshiba_acpi: use memdup_user_nul Geliang Tang <geliangtang@gmail.com> - 2017-05-06 17:50 +0200
    Re: [PATCH] platform/x86: toshiba_acpi: use memdup_user_nul Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-05-07 23:40 +0200
  [PATCH] sparc: use memdup_user_nul in sun4m LED driver Geliang Tang <geliangtang@gmail.com> - 2017-05-06 17:50 +0200
    Re: [PATCH] sparc: use memdup_user_nul in sun4m LED driver David Miller <davem@davemloft.net> - 2017-05-09 21:20 +0200
  Re: [Intel-gfx] [PATCH] drm/i915: use memdup_user_nul Daniel Vetter <daniel@ffwll.ch> - 2017-05-08 09:30 +0200

csiph-web