Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbdb58a6 authored by Eric Biggers's avatar Eric Biggers
Browse files

UPSTREAM: ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE 

This new ioctl retrieves a file's encryption nonce, which is useful for
testing.  See the corresponding fs/crypto/ patch for more details.

Link: https://lore.kernel.org/r/20200314205052.93294-3-ebiggers@kernel.org


Reviewed-by: default avatarTheodore Ts'o <tytso@mit.edu>
(cherry picked from commit 7ec9f3b47aba0fe715bf3472ed80e91c37970363)
Bug: 151100202
Change-Id: I85350aed66285b92444d37c8cd840fb03d2ca25d
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 4182a31c

fs/ext4/ioctl.c

+6 −0
Original line number Diff line number Diff line
@@ -1160,6 +1160,11 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
			return -EOPNOTSUPP;

		return fscrypt_ioctl_get_key_status(filp, (void __user *)arg);



	case FS_IOC_GET_ENCRYPTION_NONCE:

		if (!ext4_has_feature_encrypt(sb))

			return -EOPNOTSUPP;

		return fscrypt_ioctl_get_nonce(filp, (void __user *)arg);



	case EXT4_IOC_FSGETXATTR:

	{

		struct fsxattr fa;
@@ -1297,6 +1302,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case FS_IOC_REMOVE_ENCRYPTION_KEY:

	case FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS:

	case FS_IOC_GET_ENCRYPTION_KEY_STATUS:

	case FS_IOC_GET_ENCRYPTION_NONCE:

	case EXT4_IOC_SHUTDOWN:

	case FS_IOC_GETFSMAP:

	case FS_IOC_ENABLE_VERITY: