]> www.infradead.org Git - users/dwmw2/linux.git/commit
crypto: ecdh - avoid buffer overflow in ecdh_set_secret()
authorArd Biesheuvel <ardb@kernel.org>
Sat, 2 Jan 2021 13:59:09 +0000 (14:59 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Jan 2021 19:09:09 +0000 (20:09 +0100)
commitfde4c844a5a5f1c35ecc4c3ef18bdbcce7152e2f
tree8c1cd334eecc2743771b71059474d7214f511294
parent04c1d6069d93a7c4355177e68b22742bca899dcf
crypto: ecdh - avoid buffer overflow in ecdh_set_secret()

commit 0aa171e9b267ce7c52d3a3df7bc9c1fc0203dec5 upstream.

Pavel reports that commit 17858b140bf4 ("crypto: ecdh - avoid unaligned
accesses in ecdh_set_secret()") fixes one problem but introduces another:
the unconditional memcpy() introduced by that commit may overflow the
target buffer if the source data is invalid, which could be the result of
intentional tampering.

So check params.key_size explicitly against the size of the target buffer
before validating the key further.

Fixes: 17858b140bf4 ("crypto: ecdh - avoid unaligned accesses in ecdh_set_secret()")
Reported-by: Pavel Machek <pavel@denx.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
crypto/ecdh.c