From: David Gstir <david@sigma-star.at>
To: Richard Weinberger <richard@nod.at>
Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
adrian.hunter@intel.com, dedekind1@gmail.com
Subject: Re: [PATCH 2/2] ubifs: Use fscrypt ioctl() helpers
Date: Tue, 13 Dec 2016 19:39:33 +0100 [thread overview]
Message-ID: <6865661F-911A-4BF9-B60B-D5605AD6F382@sigma-star.at> (raw)
In-Reply-To: <20161212232759.30239-2-richard@nod.at>
> On 13.12.2016, at 00:27, Richard Weinberger <richard@nod.at> wrote:
>
> Commit db717d8e26c2 ("fscrypto: move ioctl processing more fully into
> common code") moved ioctl() related functions into fscrypt and offers
> us now a set of helper functions.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
> fs/ubifs/ioctl.c | 24 ++----------------------
> fs/ubifs/ubifs.h | 4 ++--
> 2 files changed, 4 insertions(+), 24 deletions(-)
>
> diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
> index 3d10f5525274..78d713644df3 100644
> --- a/fs/ubifs/ioctl.c
> +++ b/fs/ubifs/ioctl.c
> @@ -184,39 +184,19 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> case FS_IOC_SET_ENCRYPTION_POLICY: {
> #ifdef CONFIG_UBIFS_FS_ENCRYPTION
> struct ubifs_info *c = inode->i_sb->s_fs_info;
> - struct fscrypt_policy policy;
> -
> - if (copy_from_user(&policy,
> - (struct fscrypt_policy __user *)arg,
> - sizeof(policy)))
> - return -EFAULT;
>
> err = ubifs_enable_encryption(c);
> if (err)
> return err;
>
> - err = fscrypt_process_policy(file, &policy);
> -
> - return err;
> + return fscrypt_ioctl_set_policy(file, (const void __user *)arg);
> #else
> return -EOPNOTSUPP;
> #endif
> }
> case FS_IOC_GET_ENCRYPTION_POLICY: {
> #ifdef CONFIG_UBIFS_FS_ENCRYPTION
> - struct fscrypt_policy policy;
> -
> - if (!ubifs_crypt_is_encrypted(inode))
> - return -ENOENT;
> -
> - err = fscrypt_get_policy(inode, &policy);
> - if (err)
> - return err;
> -
> - if (copy_to_user((void __user *)arg, &policy, sizeof(policy)))
> - return -EFAULT;
> -
> - return 0;
> + return fscrypt_ioctl_get_policy(file, (void __user *)arg);
> #else
> return -EOPNOTSUPP;
> #endif
> diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
> index 8d0e4818e3ea..ca72382ce6cc 100644
> --- a/fs/ubifs/ubifs.h
> +++ b/fs/ubifs/ubifs.h
> @@ -1806,8 +1806,8 @@ int ubifs_decompress(const struct ubifs_info *c, const void *buf, int len,
> #define fscrypt_pullback_bio_page fscrypt_notsupp_pullback_bio_page
> #define fscrypt_restore_control_page fscrypt_notsupp_restore_control_page
> #define fscrypt_zeroout_range fscrypt_notsupp_zeroout_range
> -#define fscrypt_process_policy fscrypt_notsupp_process_policy
> -#define fscrypt_get_policy fscrypt_notsupp_get_policy
> +#define fscrypt_ioctl_set_policy fscrypt_notsupp_ioctl_set_policy
> +#define fscrypt_ioctl_get_policy fscrypt_notsupp_ioctl_get_policy
> #define fscrypt_has_permitted_context fscrypt_notsupp_has_permitted_context
> #define fscrypt_inherit_context fscrypt_notsupp_inherit_context
> #define fscrypt_get_encryption_info fscrypt_notsupp_get_encryption_info
> --
> 2.10.2
Looks good to me.
Reviewed-by: David Gstir <david@sigma-star.at>
- David
prev parent reply other threads:[~2016-12-13 18:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-12 23:27 [PATCH 1/2] ubifs: Use FS_CFLG_OWN_PAGES Richard Weinberger
2016-12-12 23:27 ` [PATCH 2/2] ubifs: Use fscrypt ioctl() helpers Richard Weinberger
2016-12-13 18:39 ` David Gstir [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=6865661F-911A-4BF9-B60B-D5605AD6F382@sigma-star.at \
--to=david@sigma-star.at \
--cc=adrian.hunter@intel.com \
--cc=dedekind1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/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).