[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170617222420.19316-13-alexander.levin@verizon.com>
Date: Sat, 17 Jun 2017 22:24:31 +0000
From: "Levin, Alexander (Sasha Levin)" <alexander.levin@...izon.com>
To: "stable@...r.kernel.org" <stable@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Cc: Eric Biggers <ebiggers@...gle.com>,
Richard Weinberger <richard@....at>,
"Levin, Alexander (Sasha Levin)" <alexander.levin@...izon.com>
Subject: [PATCH for v4.9 LTS 13/86] ubifs: allow encryption ioctls in compat
mode
From: Eric Biggers <ebiggers@...gle.com>
[ Upstream commit a75467d910135905de60b3af3f11b3693625781e ]
The ubifs encryption ioctls did not work when called by a 32-bit program
on a 64-bit kernel. Since 'struct fscrypt_policy' is not affected by
the word size, ubifs just needs to allow these ioctls through, like what
ext4 and f2fs do.
Signed-off-by: Eric Biggers <ebiggers@...gle.com>
Signed-off-by: Richard Weinberger <richard@....at>
Signed-off-by: Sasha Levin <alexander.levin@...izon.com>
---
fs/ubifs/ioctl.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
index 3c7b29de0ca7..49d6c0f89c50 100644
--- a/fs/ubifs/ioctl.c
+++ b/fs/ubifs/ioctl.c
@@ -197,6 +197,9 @@ long ubifs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case FS_IOC32_SETFLAGS:
cmd = FS_IOC_SETFLAGS;
break;
+ case FS_IOC_SET_ENCRYPTION_POLICY:
+ case FS_IOC_GET_ENCRYPTION_POLICY:
+ break;
default:
return -ENOIOCTLCMD;
}
--
2.11.0
Powered by blists - more mailing lists