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 [thread overview]
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
prev parent reply other threads:[~2020-01-14 21:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-31 17:54 [PATCH] fs-verity: use u64_to_user_ptr() Eric Biggers
2020-01-14 21:33 ` Eric Biggers [this message]
Reply instructions:
You may reply publicly 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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).