mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-04 04:02:26 +00:00
d1fdfb0b2f
Commit 'fa6999e326fe ("s390/pkey: support CCA and EP11 secure ECC
private keys")' introduced a new PKEY_TYPE_EP11_AES type for the
PKEY_KBLOB2PROTK2 and a new IOCTL, PKEY_KBLOB2PROTK3, which both
allows userspace to convert opaque securekey blobs of this type into
protectedkey blobs. Unfortunately, all PKEY_KBLOB2PROTK2 and
PKEY_KBLOB2PROTK3 IOCTL requests with this keyblobs of this type
return with an error (-EINVAL). Fix PKEY_TYPE_EP11_AES handling in
PKEY_KBLOB2PROTK2 and PKEY_KBLOB2PROTK3 IOCTLs, so that userspace can
convert PKEY_TYPE_EP11_AES keyblobs into protectedkey blobs.
Add a helper function to decode the start and size of the internal
header as well as start and size of the keyblob payload of an existing
keyblob. Also validate the length of header and keyblob, as well as
the keyblob magic.
Introduce another helper function, which handles a raw key wrapping
request and do the keyblob decoding in the calling function. Remove
all other header-related calculations.
Fixes:
|
||
|---|---|---|
| .. | ||
| ap_bus.c | ||
| ap_bus.h | ||
| ap_card.c | ||
| ap_debug.h | ||
| ap_queue.c | ||
| Makefile | ||
| pkey_api.c | ||
| vfio_ap_debug.h | ||
| vfio_ap_drv.c | ||
| vfio_ap_ops.c | ||
| vfio_ap_private.h | ||
| zcrypt_api.c | ||
| zcrypt_api.h | ||
| zcrypt_card.c | ||
| zcrypt_cca_key.h | ||
| zcrypt_ccamisc.c | ||
| zcrypt_ccamisc.h | ||
| zcrypt_cex2a.c | ||
| zcrypt_cex2a.h | ||
| zcrypt_cex2c.c | ||
| zcrypt_cex2c.h | ||
| zcrypt_cex4.c | ||
| zcrypt_cex4.h | ||
| zcrypt_debug.h | ||
| zcrypt_ep11misc.c | ||
| zcrypt_ep11misc.h | ||
| zcrypt_error.h | ||
| zcrypt_msgtype6.c | ||
| zcrypt_msgtype6.h | ||
| zcrypt_msgtype50.c | ||
| zcrypt_msgtype50.h | ||
| zcrypt_queue.c | ||