nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

dh key: fix rounding up KDF output length

Browse source 
Commit 383203eff7 ("dh key: get rid of stack allocated array") changed
kdf_ctr() to assume that the length of key material to derive is a
multiple of the digest size.  The length was supposed to be rounded up
accordingly.  However, the round_up() macro was used which only gives
the correct result on power-of-2 arguments, whereas not all hash
algorithms have power-of-2 digest sizes.  In some cases this resulted in
a write past the end of the 'outbuf' buffer.

Fix it by switching to roundup(), which works for non-power-of-2 inputs.

Reported-by: syzbot+486f97f892efeb2075a3@syzkaller.appspotmail.com
Reported-by: syzbot+29d17b7898b41ee120a5@syzkaller.appspotmail.com
Reported-by: syzbot+8a608baf8751184ec727@syzkaller.appspotmail.com
Reported-by: syzbot+d04e58bd384f1fe0b112@syzkaller.appspotmail.com
Fixes: 383203eff7 ("dh key: get rid of stack allocated array")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Tycho Andersen <tycho@tycho.ws>
Signed-off-by: James Morris <james.morris@microsoft.com>
This commit is contained in:
Eric Biggers 2018-06-26 16:59:46 +01:00 committed by James Morris
parent 2e20ce4a66
commit 3619dec510
1 changed files with 4 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
security/keys/dh.c
View file

@ -142,6 +142,8 @@ static void kdf_dealloc(struct kdf_sdesc *sdesc)
* The src pointer is defined as Z || other info where Z is the shared secret * The src pointer is defined as Z || other info where Z is the shared secret
* from DH and other info is an arbitrary string (see SP800-56A section * from DH and other info is an arbitrary string (see SP800-56A section
* 5.8.1.2). * 5.8.1.2).
*
* 'dlen' must be a multiple of the digest size.
*/ */
static int kdf_ctr(struct kdf_sdesc *sdesc, const u8 *src, unsigned int slen, static int kdf_ctr(struct kdf_sdesc *sdesc, const u8 *src, unsigned int slen,
u8 *dst, unsigned int dlen, unsigned int zlen) u8 *dst, unsigned int dlen, unsigned int zlen)
@ -205,8 +207,8 @@ static int keyctl_dh_compute_kdf(struct kdf_sdesc *sdesc,
{ {
uint8_t *outbuf = NULL; uint8_t *outbuf = NULL;
int ret; int ret;
size_t outbuf_len = round_up(buflen, size_t outbuf_len = roundup(buflen,
crypto_shash_digestsize(sdesc->shash.tfm)); crypto_shash_digestsize(sdesc->shash.tfm));
outbuf = kmalloc(outbuf_len, GFP_KERNEL); outbuf = kmalloc(outbuf_len, GFP_KERNEL);
if (!outbuf) { if (!outbuf) {