From a4e87d4bb6bfb5e9c24e7fc15cb489251dc321ff Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 18 Sep 2019 18:31:10 -0700 Subject: sys/linux: update fscrypt descriptions - For v5.4: new ioctls FS_IOC_ADD_ENCRYPTION_KEY, FS_IOC_REMOVE_ENCRYPTION_KEY, FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS, FS_IOC_GET_ENCRYPTION_KEY_STATUS, and FS_IOC_GET_ENCRYPTION_POLICY_EX. - For v5.4: FS_IOC_SET_ENCRYPTION_POLICY now accepts an fscrypt_policy_v2 argument in addition to the original fscrypt_policy which is now called fscrypt_policy_v1. - For v5.4: the fscrypt definitions were moved to a new header , and some constants were given new FSCRYPT_* names instead of FS_*. Handle this, and to keep things organized similarly move the syzkaller descriptions to a new file fscrypt.txt. - For v5.0: remove the removed Speck modes and add Adiantum. - For v5.0: add the DIRECT_KEY encryption policy flag. Also fix the argument types for FS_IOC_GET_ENCRYPTION_POLICY and FS_IOC_GET_ENCRYPTION_PWSALT, which had been mixed up. --- sys/linux/fs_ioctl.txt | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'sys/linux/fs_ioctl.txt') diff --git a/sys/linux/fs_ioctl.txt b/sys/linux/fs_ioctl.txt index 977bfdbac..49abb6c01 100644 --- a/sys/linux/fs_ioctl.txt +++ b/sys/linux/fs_ioctl.txt @@ -23,31 +23,8 @@ ioctl$FS_IOC_FSGETXATTR(fd fd, cmd const[FS_IOC_FSGETXATTR], arg ptr[in, fsxattr ioctl$FS_IOC_FSSETXATTR(fd fd, cmd const[FS_IOC_FSSETXATTR], arg ptr[in, fsxattr]) ioctl$FS_IOC_GETFSLABEL(fd fd, cmd const[FS_IOC_GETFSLABEL], arg ptr[out, array[const[0, int8], FSLABEL_MAX]]) ioctl$FS_IOC_SETFSLABEL(fd fd, cmd const[FS_IOC_SETFSLABEL], arg ptr[in, array[int8, FSLABEL_MAX]]) -ioctl$FS_IOC_SET_ENCRYPTION_POLICY(fd fd, cmd const[FS_IOC_SET_ENCRYPTION_POLICY], arg ptr[in, fscrypt_policy]) -ioctl$FS_IOC_GET_ENCRYPTION_POLICY(fd fd, cmd const[FS_IOC_GET_ENCRYPTION_POLICY], arg ptr[out, array[int8, 16]]) -ioctl$FS_IOC_GET_ENCRYPTION_PWSALT(fd fd, cmd const[FS_IOC_GET_ENCRYPTION_PWSALT], arg ptr[out, fscrypt_policy]) ioctl$FS_IOC_GETFSMAP(fd fd, cmd const[FS_IOC_GETFSMAP], arg ptr[in, fsmap_head]) -fscrypt_policy { - version const[0, int8] - mode fscrypt_policy_mode - flags flags[fs_policy_flags, int8] - master_key_descriptor array[int8, FS_KEY_DESCRIPTOR_SIZE] -} - -fscrypt_policy_mode [ - aes128 fscrypt_policy_mode_t[FS_ENCRYPTION_MODE_AES_128_CBC, FS_ENCRYPTION_MODE_AES_128_CTS] - aes256 fscrypt_policy_mode_t[FS_ENCRYPTION_MODE_AES_256_XTS, FS_ENCRYPTION_MODE_AES_256_CTS] - speck128 fscrypt_policy_mode_t[FS_ENCRYPTION_MODE_SPECK128_256_XTS, FS_ENCRYPTION_MODE_SPECK128_256_CTS] -] - -type fscrypt_policy_mode_t[CONTENTS, FILENAMES] { - contents_encryption_mode const[CONTENTS, int8] - filenames_encryption_mode const[FILENAMES, int8] -} - -fs_policy_flags = FS_POLICY_FLAGS_PAD_4, FS_POLICY_FLAGS_PAD_8, FS_POLICY_FLAGS_PAD_16 - space_resv { l_type const[0, int16] l_whence flags[seek_whence, int16] -- cgit mrf-deployment