Am Donnerstag, 20. April 2017, 07:46:31 CEST schrieb Eric Biggers:
Hi Eric,
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> The result of the Diffie-Hellman computation may be shorter than the
> input prime number. Only calculate the KDF over the actual result;
> don't include additional uninitialized memory.
Thank you for catching that (and all the rest). But I think this patch is not
correct. If the DH operation results in a shorter value, the trailing part
must be set to null and the KDF calculated over the entire prime length.
Thus, if the DH result is shorter than the prime, the memory should look like
DH result || 0x00 <as often as needed to make it prime length> || otherinfo.
Thus, instead of this patch, I would think that the kmalloc call should be
changed to a kzalloc.
>
> Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
> ---
> security/keys/dh.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/security/keys/dh.c b/security/keys/dh.c
> index 1c1cac677041..a3a8607107f5 100644
> --- a/security/keys/dh.c
> +++ b/security/keys/dh.c
> @@ -313,17 +313,6 @@ long __keyctl_dh_compute(struct keyctl_dh_params __user
> *params, goto error4;
> }
>
> - /*
> - * Concatenate SP800-56A otherinfo past DH shared secret -- the
> - * input to the KDF is (DH shared secret || otherinfo)
> - */
> - if (kdfcopy &&
> - copy_from_user(kbuf + resultlen, kdfcopy->otherinfo,
> - kdfcopy->otherinfolen) != 0) {
> - ret = -EFAULT;
> - goto error5;
> - }
> -
> ret = do_dh(result, base, private, prime);
> if (ret)
> goto error5;
> @@ -333,8 +322,17 @@ long __keyctl_dh_compute(struct keyctl_dh_params __user
> *params, goto error5;
>
> if (kdfcopy) {
> + /*
> + * Concatenate SP800-56A otherinfo past DH shared secret -- the
> + * input to the KDF is (DH shared secret || otherinfo)
> + */
> + if (copy_from_user(kbuf + nbytes, kdfcopy->otherinfo,
> + kdfcopy->otherinfolen) != 0) {
> + ret = -EFAULT;
> + goto error5;
> + }
> ret = keyctl_dh_compute_kdf(sdesc, buffer, buflen, kbuf,
> - resultlen + kdfcopy->otherinfolen);
> + nbytes + kdfcopy->otherinfolen);
> } else {
> ret = nbytes;
> if (copy_to_user(buffer, kbuf, nbytes) != 0)
Ciao
Stephan
