mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:46:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bpf: crypto: make state and IV dynptr nullable

Browse Source 
Some ciphers do not require state and IV buffer, but with current
implementation 0-sized dynptr is always needed. With adjustment to
verifier we can provide NULL instead of 0-sized dynptr. Make crypto
kfuncs ready for this.

Reviewed-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Vadim Fedorenko <vadfed@meta.com>
Link: https://lore.kernel.org/r/20240613211817.1551967-3-vadfed@meta.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Vadim Fedorenko 2024-06-13 14:18:14 -07:00 committed by Alexei Starovoitov
parent a90797993a
commit 65d6d61d25
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/bpf/crypto.c
View File

@ -275,7 +275,7 @@ static int bpf_crypto_crypt(const struct bpf_crypto_ctx *ctx,
if (__bpf_dynptr_is_rdonly(dst)) if (__bpf_dynptr_is_rdonly(dst))
return -EINVAL; return -EINVAL;
siv_len = __bpf_dynptr_size(siv); siv_len = siv ? __bpf_dynptr_size(siv) : 0;
src_len = __bpf_dynptr_size(src); src_len = __bpf_dynptr_size(src);
dst_len = __bpf_dynptr_size(dst); dst_len = __bpf_dynptr_size(dst);
if (!src_len || !dst_len) if (!src_len || !dst_len)
@ -303,42 +303,42 @@ static int bpf_crypto_crypt(const struct bpf_crypto_ctx *ctx,
/** /**
* bpf_crypto_decrypt() - Decrypt buffer using configured context and IV provided. * bpf_crypto_decrypt() - Decrypt buffer using configured context and IV provided.
* @ctx: The crypto context being used. The ctx must be a trusted pointer. * @ctx: The crypto context being used. The ctx must be a trusted pointer.
* @src: bpf_dynptr to the encrypted data. Must be a trusted pointer. * @src: bpf_dynptr to the encrypted data. Must be a trusted pointer.
* @dst: bpf_dynptr to the buffer where to store the result. Must be a trusted pointer. * @dst: bpf_dynptr to the buffer where to store the result. Must be a trusted pointer.
* @siv: bpf_dynptr to IV data and state data to be used by decryptor. * @siv__nullable: bpf_dynptr to IV data and state data to be used by decryptor. May be NULL.
* *
* Decrypts provided buffer using IV data and the crypto context. Crypto context must be configured. * Decrypts provided buffer using IV data and the crypto context. Crypto context must be configured.
*/ */
__bpf_kfunc int bpf_crypto_decrypt(struct bpf_crypto_ctx *ctx, __bpf_kfunc int bpf_crypto_decrypt(struct bpf_crypto_ctx *ctx,
const struct bpf_dynptr *src, const struct bpf_dynptr *src,
const struct bpf_dynptr *dst, const struct bpf_dynptr *dst,
const struct bpf_dynptr *siv) const struct bpf_dynptr *siv__nullable)
{ {
const struct bpf_dynptr_kern *src_kern = (struct bpf_dynptr_kern *)src; const struct bpf_dynptr_kern *src_kern = (struct bpf_dynptr_kern *)src;
const struct bpf_dynptr_kern *dst_kern = (struct bpf_dynptr_kern *)dst; const struct bpf_dynptr_kern *dst_kern = (struct bpf_dynptr_kern *)dst;
const struct bpf_dynptr_kern *siv_kern = (struct bpf_dynptr_kern *)siv; const struct bpf_dynptr_kern *siv_kern = (struct bpf_dynptr_kern *)siv__nullable;
return bpf_crypto_crypt(ctx, src_kern, dst_kern, siv_kern, true); return bpf_crypto_crypt(ctx, src_kern, dst_kern, siv_kern, true);
} }
/** /**
* bpf_crypto_encrypt() - Encrypt buffer using configured context and IV provided. * bpf_crypto_encrypt() - Encrypt buffer using configured context and IV provided.
* @ctx: The crypto context being used. The ctx must be a trusted pointer. * @ctx: The crypto context being used. The ctx must be a trusted pointer.
* @src: bpf_dynptr to the plain data. Must be a trusted pointer. * @src: bpf_dynptr to the plain data. Must be a trusted pointer.
* @dst: bpf_dynptr to buffer where to store the result. Must be a trusted pointer. * @dst: bpf_dynptr to the buffer where to store the result. Must be a trusted pointer.
* @siv: bpf_dynptr to IV data and state data to be used by decryptor. * @siv__nullable: bpf_dynptr to IV data and state data to be used by decryptor. May be NULL.
* *
* Encrypts provided buffer using IV data and the crypto context. Crypto context must be configured. * Encrypts provided buffer using IV data and the crypto context. Crypto context must be configured.
*/ */
__bpf_kfunc int bpf_crypto_encrypt(struct bpf_crypto_ctx *ctx, __bpf_kfunc int bpf_crypto_encrypt(struct bpf_crypto_ctx *ctx,
const struct bpf_dynptr *src, const struct bpf_dynptr *src,
const struct bpf_dynptr *dst, const struct bpf_dynptr *dst,
const struct bpf_dynptr *siv) const struct bpf_dynptr *siv__nullable)
{ {
const struct bpf_dynptr_kern *src_kern = (struct bpf_dynptr_kern *)src; const struct bpf_dynptr_kern *src_kern = (struct bpf_dynptr_kern *)src;
const struct bpf_dynptr_kern *dst_kern = (struct bpf_dynptr_kern *)dst; const struct bpf_dynptr_kern *dst_kern = (struct bpf_dynptr_kern *)dst;
const struct bpf_dynptr_kern *siv_kern = (struct bpf_dynptr_kern *)siv; const struct bpf_dynptr_kern *siv_kern = (struct bpf_dynptr_kern *)siv__nullable;
return bpf_crypto_crypt(ctx, src_kern, dst_kern, siv_kern, false); return bpf_crypto_crypt(ctx, src_kern, dst_kern, siv_kern, false);
} }