diff options
author | Eric Biggers <ebiggers@google.com> | 2018-06-26 16:59:46 +0100 |
---|---|---|
committer | James Morris <james.morris@microsoft.com> | 2018-06-26 09:43:05 -0700 |
commit | 3619dec5103dd999a777e3e4ea08c8f40a6ddc57 (patch) | |
tree | baf202f770e183d2222468917a1e975d65bb9156 /fs/9p/fid.c | |
parent | 2e20ce4a66b798671c60198ea2547d5e090dd991 (diff) | |
download | linux-stable-3619dec5103dd999a777e3e4ea08c8f40a6ddc57.tar.gz linux-stable-3619dec5103dd999a777e3e4ea08c8f40a6ddc57.tar.bz2 linux-stable-3619dec5103dd999a777e3e4ea08c8f40a6ddc57.zip |
dh key: fix rounding up KDF output length
Commit 383203eff718 ("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: 383203eff718 ("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>
Diffstat (limited to 'fs/9p/fid.c')
0 files changed, 0 insertions, 0 deletions