linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chirantan Ekbote <chirantan@chromium.org>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: linux-fsdevel@vger.kernel.org, Dylan Reid <dgreid@chromium.org>,
	Suleiman Souhlal <suleiman@chromium.org>,
	fuse-devel@lists.sourceforge.net,
	Eric Biggers <ebiggers@kernel.org>,
	Chirantan Ekbote <chirantan@chromium.org>
Subject: [PATCH] fuse: Support FS_IOC_GET_ENCRYPTION_POLICY_EX
Date: Mon,  7 Dec 2020 13:03:03 +0900	[thread overview]
Message-ID: <20201207040303.906100-1-chirantan@chromium.org> (raw)

This is a dynamically sized ioctl so we need to check the user-provided
parameter for the actual length.

Signed-off-by: Chirantan Ekbote <chirantan@chromium.org>
---
 fs/fuse/file.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index c03034e8c1529..1627c14e9dacc 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -19,6 +19,7 @@
 #include <linux/falloc.h>
 #include <linux/uio.h>
 #include <linux/fs.h>
+#include <linux/fscrypt.h>
 
 static struct page **fuse_pages_alloc(unsigned int npages, gfp_t flags,
 				      struct fuse_page_desc **desc)
@@ -2808,6 +2809,21 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
 		case FS_IOC_SETFLAGS:
 			iov->iov_len = sizeof(int);
 			break;
+		case FS_IOC_GET_ENCRYPTION_POLICY_EX: {
+			struct fscrypt_get_policy_ex_arg policy;
+			unsigned long size_ptr =
+				arg + offsetof(struct fscrypt_get_policy_ex_arg,
+					       policy_size);
+
+			if (copy_from_user(&policy.policy_size,
+					   (void __user *)size_ptr,
+					   sizeof(policy.policy_size)))
+				return -EFAULT;
+
+			iov->iov_len =
+				sizeof(policy.policy_size) + policy.policy_size;
+			break;
+		}
 		default:
 			iov->iov_len = _IOC_SIZE(cmd);
 			break;
-- 
2.29.2.576.ga3fc446d84-goog


             reply	other threads:[~2020-12-07  4:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-07  4:03 Chirantan Ekbote [this message]
2020-12-07 18:01 ` [PATCH] fuse: Support FS_IOC_GET_ENCRYPTION_POLICY_EX Eric Biggers
2020-12-08  9:38 ` [PATCH v2 0/2] fuse: fscrypt ioctl support Chirantan Ekbote
2020-12-08  9:38   ` [PATCH v2 1/2] fuse: Move ioctl length calculation to a separate function Chirantan Ekbote
2020-12-11 18:11     ` Eric Biggers
2020-12-08  9:38   ` [PATCH v2 2/2] fuse: Support FS_IOC_GET_ENCRYPTION_POLICY_EX Chirantan Ekbote
2020-12-11 18:12     ` Eric Biggers
2021-02-15 14:49     ` Miklos Szeredi

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=20201207040303.906100-1-chirantan@chromium.org \
    --to=chirantan@chromium.org \
    --cc=dgreid@chromium.org \
    --cc=ebiggers@kernel.org \
    --cc=fuse-devel@lists.sourceforge.net \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    --cc=suleiman@chromium.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).