Linux-FSCrypt Archive on lore.kernel.org
 help / color / Atom feed
From: Eric Biggers <ebiggers@kernel.org>
To: linux-fscrypt@vger.kernel.org
Subject: Re: [PATCH] fs-verity: use u64_to_user_ptr()
Date: Tue, 14 Jan 2020 13:33:12 -0800
Message-ID: <20200114213312.GJ41220@gmail.com> (raw)
In-Reply-To: <20191231175408.20524-1-ebiggers@kernel.org>

On Tue, Dec 31, 2019 at 11:54:08AM -0600, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> <linux/kernel.h> already provides a macro u64_to_user_ptr().
> Use it instead of open-coding the two casts.
> 
> No change in behavior.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  fs/verity/enable.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/verity/enable.c b/fs/verity/enable.c
> index 1645d6326e32..520db12e2945 100644
> --- a/fs/verity/enable.c
> +++ b/fs/verity/enable.c
> @@ -216,8 +216,7 @@ static int enable_verity(struct file *filp,
>  
>  	/* Get the salt if the user provided one */
>  	if (arg->salt_size &&
> -	    copy_from_user(desc->salt,
> -			   (const u8 __user *)(uintptr_t)arg->salt_ptr,
> +	    copy_from_user(desc->salt, u64_to_user_ptr(arg->salt_ptr),
>  			   arg->salt_size)) {
>  		err = -EFAULT;
>  		goto out;
> @@ -226,8 +225,7 @@ static int enable_verity(struct file *filp,
>  
>  	/* Get the signature if the user provided one */
>  	if (arg->sig_size &&
> -	    copy_from_user(desc->signature,
> -			   (const u8 __user *)(uintptr_t)arg->sig_ptr,
> +	    copy_from_user(desc->signature, u64_to_user_ptr(arg->sig_ptr),
>  			   arg->sig_size)) {
>  		err = -EFAULT;
>  		goto out;

Applied to fscrypt.git#fsverity for 5.6.

- Eric

      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-31 17:54 Eric Biggers
2020-01-14 21:33 ` Eric Biggers [this message]

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200114213312.GJ41220@gmail.com \
    --to=ebiggers@kernel.org \
    --cc=linux-fscrypt@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-FSCrypt Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-fscrypt/0 linux-fscrypt/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-fscrypt linux-fscrypt/ https://lore.kernel.org/linux-fscrypt \
		linux-fscrypt@vger.kernel.org
	public-inbox-index linux-fscrypt

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-fscrypt


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git