xfs_io/encrypt: support passing a keyring key to add_enckey
Subsystems (2)
Eric Biggers
maintainerRFC PATCH 1/1 xfs_io/encrypt: support passing a keyring key to add_enckey
From: Eric Biggers <[email protected]>
Add a '-k' option to the 'add_enckey' xfs_io command to allow exercising the key_id field that is being added to struct fscrypt_add_key_arg.
This is needed for the corresponding test in xfstests.
For more details, see the corresponding xfstests and kernel patches.
Signed-off-by Eric Biggers <[email protected]>
---
I'm sending this out for comment now, but it shouldn't be merged until the corresponding kernel patch has reached mainline.
configure.ac | 1 + include/builddefs.in | 4 ++ io/encrypt.c | 90 +++++++++++++++++++++++++++++++------------ m4/package_libcdev.m4 | 21 ++++++++++ man/man8/xfs_io.8 | 10 +++-- 5 files changed, 98 insertions(+), 28 deletions(-)
configure.ac +1 -0
@@ -176,6 +176,7 @@ AC_HAVE_READDIR AC_HAVE_FSETXATTR AC_HAVE_MREMAP AC_NEED_INTERNAL_FSXATTR +AC_NEED_INTERNAL_FSCRYPT_ADD_KEY_ARG AC_HAVE_GETFSMAP AC_HAVE_STATFS_FLAGS AC_HAVE_MAP_SYNC
include/builddefs.in +4 -0
@@ -102,6 +102,7 @@ HAVE_FLS = @have_fls@ HAVE_FSETXATTR = @have_fsetxattr@ HAVE_MREMAP = @have_mremap@ NEED_INTERNAL_FSXATTR = @need_internal_fsxattr@ +NEED_INTERNAL_FSCRYPT_ADD_KEY_ARG = @need_internal_fscrypt_add_key_arg@ HAVE_GETFSMAP = @have_getfsmap@ HAVE_STATFS_FLAGS = @have_statfs_flags@ HAVE_MAP_SYNC = @have_map_sync@
@@ -141,6 +142,9 @@ endif ifeq ($(NEED_INTERNAL_FSXATTR),yes) PCFLAGS+= -DOVERRIDE_SYSTEM_FSXATTR endif +ifeq ($(NEED_INTERNAL_FSCRYPT_ADD_KEY_ARG),yes) +PCFLAGS+= -DOVERRIDE_SYSTEM_FSCRYPT_ADD_KEY_ARG +endif ifeq ($(HAVE_GETFSMAP),yes) PCFLAGS+= -DHAVE_GETFSMAP endif
io/encrypt.c +65 -25
145 lines not on this page · raw message
m4/package_libcdev.m4 +21 -0
@@ -278,6 +278,27 @@ AC_DEFUN([AC_NEED_INTERNAL_FSXATTR], AC_SUBST(need_internal_fsxattr) ]) +# +# Check if we need to override the system struct fscrypt_add_key_arg +# with the internal definition. This /only/ happens if the system +# actually defines struct fscrypt_add_key_arg /and/ the system +# definition is missing certain fields. +# +AC_DEFUN([AC_NEED_INTERNAL_FSCRYPT_ADD_KEY_ARG], + [ + AC_CHECK_TYPE(struct fscrypt_add_key_arg, + [ + AC_CHECK_MEMBER(struct fscrypt_add_key_arg.key_id, + , + need_internal_fscrypt_add_key_arg=yes, + [#include <linux/fs.h>] + ) + ],, + [#include <linux/fs.h>] + ) + AC_SUBST(need_internal_fscrypt_add_key_arg) + ]) + # # Check if we have a FS_IOC_GETFSMAP ioctl (Linux) #
man/man8/xfs_io.8 +7 -3
@@ -749,10 +749,10 @@ Test whether v2 encryption policies are supported. Prints "supported", .RE .PD .TP -.BI "add_enckey [ \-d " descriptor " ]" +.BI "add_enckey [ \-d " descriptor " ] [ \-k " key_id " ]" On filesystems that support encryption, add an encryption key to the filesystem -containing the currently open file. The key in binary (typically 64 bytes long) -is read from standard input. +containing the currently open file. By default, the raw key in binary +(typically 64 bytes long) is read from standard input. .RS 1.0i .PD 0 .TP 0.4i
@@ -761,6 +761,10 @@ key descriptor, as a 16-character hex string (8 bytes). If given, the key will be available for use by v1 encryption policies that use this descriptor. Otherwise, the key is added as a v2 policy key, and on success the resulting "key identifier" will be printed. +.TP +.BI \-k " key_id" +ID of kernel keyring key of type "fscrypt-provisioning". If given, the raw key +will be taken from here rather than from standard input. .RE .PD .TP
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog