Commit f65b9dba authored Feb 12, 2020 by Arnaldo Carvalho de Melo

tools headers uapi: Sync linux/fscrypt.h with the kernel sources



To pick the changes from:

  e933adde ("fscrypt: include <linux/ioctl.h> in UAPI header")
  93edd392 ("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 <adrian.hunter@intel.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent d6d829d9

tools/include/uapi/linux/fscrypt.h

+13 −1

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		#ifndef _UAPI_LINUX_FSCRYPT_H
		#define _UAPI_LINUX_FSCRYPT_H

		#include <linux/ioctl.h>
		#include <linux/types.h>

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

		/*
		* Payload of Linux keyring key of type "fscrypt-provisioning", referenced by
		* fscrypt_add_key_arg::key_id as an alternative to fscrypt_add_key_arg::raw.
		*/
		struct fscrypt_provisioning_key_payload {
		__u32 type;
		__u32 __reserved;
		__u8 raw[];
		};

		/* Struct passed to FS_IOC_ADD_ENCRYPTION_KEY */
		struct fscrypt_add_key_arg {
		struct fscrypt_key_specifier key_spec;
		__u32 raw_size;
		__u32 __reserved[9];
		__u32 key_id;
		__u32 __reserved[8];
		__u8 raw[];
		};

Admin message