Pull fscrypt update from Eric Biggers: "Add support for 'hardware-wrapped inline encryption keys' to fscrypt. When enabled on supported platforms, this feature protects file contents keys from certain attacks, such as cold boot attacks. This feature uses the block layer support for wrapped keys which was merged in 6.15. Wrapped key support has existed out-of-tree in Android for a long time, and it's finally ready for upstream now that there is a platform on which it works end-to-end with upstream. Specifically, it works on the Qualcomm SM8650 HDK, using the Qualcomm ICE (Inline Crypto Engine) and HWKM (Hardware Key Manager). The corresponding driver support is included in the SCSI tree for 6.16. Validation for this feature includes two new tests that were already merged into xfstests (generic/368 and generic/369)" * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux: fscrypt: add support for hardware-wrapped keys
Showing the changes to include/uapi/linux (1 of 8 files). Show all
Unified · Split
| @@ -119,7 +119,7 @@ struct fscrypt_key_specifier { · 118 unmodified lines | |||
| 119 | */ | 119 | */ |
| 120 | struct fscrypt_provisioning_key_payload { | 120 | struct fscrypt_provisioning_key_payload { |
| 121 | __u32 type; | 121 | __u32 type; |
| 122 | __u32 __reserved; | 122 | __u32 flags; |
| 123 | __u8 raw[]; | 123 | __u8 raw[]; |
| 124 | }; | 124 | }; |
| 125 | 125 | ||
| @@ -128,7 +128,9 @@ struct fscrypt_add_key_arg { · 2 unmodified lines | |||
| 128 | struct fscrypt_key_specifier key_spec; | 128 | struct fscrypt_key_specifier key_spec; |
| 129 | __u32 raw_size; | 129 | __u32 raw_size; |
| 130 | __u32 key_id; | 130 | __u32 key_id; |
| 131 | __u32 __reserved[8]; | 131 | #define FSCRYPT_ADD_KEY_FLAG_HW_WRAPPED 0x00000001 |
| 132 | __u32 flags; | ||
| 133 | __u32 __reserved[7]; | ||
| 132 | __u8 raw[]; | 134 | __u8 raw[]; |
| 133 | }; | 135 | }; |
| 134 | 136 | ||