Commit a2713257 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by David S. Miller
Browse files

tls: Use size_add() in call to struct_size() 



If, for any reason, the open-coded arithmetic causes a wraparound,
the protection that `struct_size()` adds against potential integer
overflows is defeated. Fix this by hardening call to `struct_size()`
with `size_add()`.

Fixes: b89fec54 ("tls: rx: wrap decrypt params in a struct")
Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e22c6ea0

net/tls/tls_sw.c

+1 −1
Original line number Diff line number Diff line
@@ -1487,7 +1487,7 @@ static int tls_decrypt_sg(struct sock *sk, struct iov_iter *out_iov, 
	 */

	aead_size = sizeof(*aead_req) + crypto_aead_reqsize(ctx->aead_recv);

	aead_size = ALIGN(aead_size, __alignof__(*dctx));

	mem = kmalloc(aead_size + struct_size(dctx, sg, n_sgin + n_sgout),

	mem = kmalloc(aead_size + struct_size(dctx, sg, size_add(n_sgin, n_sgout)),

		      sk->sk_allocation);

	if (!mem) {

		err = -ENOMEM;