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

Commit 66042ce5 authored by Eric Biggers's avatar Eric Biggers
Browse files

UPSTREAM: ubifs: 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-5-ebiggers@kernel.org


Change-Id: I8f15e873b41e036bc039119a579beac1b78f937b
Bug: 151100202
(cherry picked from commit 861261f2a9cc488c845fc214d9035f7a11094591)
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent e6d34c1d

fs/ubifs/ioctl.c

+4 −0
Original line number Diff line number Diff line
@@ -229,6 +229,9 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case FS_IOC_GET_ENCRYPTION_KEY_STATUS:

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



	case FS_IOC_GET_ENCRYPTION_NONCE:

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



	default:

		return -ENOTTY;

	}
@@ -251,6 +254,7 @@ long ubifs_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:

		break;

	default:

		return -ENOIOCTLCMD;