Commit 744f05d3 authored by Eric Biggers's avatar Eric Biggers Committed by David Howells

KEYS: DH: don't feed uninitialized "otherinfo" into KDF

If userspace called KEYCTL_DH_COMPUTE with kdf_params containing NULL
otherinfo but nonzero otherinfolen, the kernel would allocate a buffer
for the otherinfo, then feed it into the KDF without initializing it.
Fix this by always doing the copy from userspace (which will fail with
EFAULT in this scenario).
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarStephan Mueller <smueller@chronox.de>
parent 7265558d
...@@ -317,7 +317,7 @@ long __keyctl_dh_compute(struct keyctl_dh_params __user *params, ...@@ -317,7 +317,7 @@ long __keyctl_dh_compute(struct keyctl_dh_params __user *params,
* Concatenate SP800-56A otherinfo past DH shared secret -- the * Concatenate SP800-56A otherinfo past DH shared secret -- the
* input to the KDF is (DH shared secret || otherinfo) * input to the KDF is (DH shared secret || otherinfo)
*/ */
if (kdfcopy && kdfcopy->otherinfo && if (kdfcopy &&
copy_from_user(kbuf + resultlen, kdfcopy->otherinfo, copy_from_user(kbuf + resultlen, kdfcopy->otherinfo,
kdfcopy->otherinfolen) != 0) { kdfcopy->otherinfolen) != 0) {
ret = -EFAULT; ret = -EFAULT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment