Skip to content

Commit f65b9db

Browse files
committed
tools headers uapi: Sync linux/fscrypt.h with the kernel sources
To pick the changes from: e933add ("fscrypt: include <linux/ioctl.h> in UAPI header") 93edd39 ("fscrypt: support passing a keyring key to FS_IOC_ADD_ENCRYPTION_KEY") That don't trigger any changes in tooling. This silences this perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/fscrypt.h' differs from latest version at 'include/uapi/linux/fscrypt.h' diff -u tools/include/uapi/linux/fscrypt.h include/uapi/linux/fscrypt.h Cc: Adrian Hunter <[email protected]> Cc: Eric Biggers <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent d6d829d commit f65b9db

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

tools/include/uapi/linux/fscrypt.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#ifndef _UAPI_LINUX_FSCRYPT_H
99
#define _UAPI_LINUX_FSCRYPT_H
1010

11+
#include <linux/ioctl.h>
1112
#include <linux/types.h>
1213

1314
/* Encryption policy flags */
@@ -109,11 +110,22 @@ struct fscrypt_key_specifier {
109110
} u;
110111
};
111112

113+
/*
114+
* Payload of Linux keyring key of type "fscrypt-provisioning", referenced by
115+
* fscrypt_add_key_arg::key_id as an alternative to fscrypt_add_key_arg::raw.
116+
*/
117+
struct fscrypt_provisioning_key_payload {
118+
__u32 type;
119+
__u32 __reserved;
120+
__u8 raw[];
121+
};
122+
112123
/* Struct passed to FS_IOC_ADD_ENCRYPTION_KEY */
113124
struct fscrypt_add_key_arg {
114125
struct fscrypt_key_specifier key_spec;
115126
__u32 raw_size;
116-
__u32 __reserved[9];
127+
__u32 key_id;
128+
__u32 __reserved[8];
117129
__u8 raw[];
118130
};
119131

0 commit comments

Comments
 (0)