Skip to content

Commit a271325

Browse files
GustavoARSilvadavem330
authored andcommitted
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: b89fec5 ("tls: rx: wrap decrypt params in a struct") Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent e22c6ea commit a271325

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

net/tls/tls_sw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,7 +1487,7 @@ static int tls_decrypt_sg(struct sock *sk, struct iov_iter *out_iov,
14871487
*/
14881488
aead_size = sizeof(*aead_req) + crypto_aead_reqsize(ctx->aead_recv);
14891489
aead_size = ALIGN(aead_size, __alignof__(*dctx));
1490-
mem = kmalloc(aead_size + struct_size(dctx, sg, n_sgin + n_sgout),
1490+
mem = kmalloc(aead_size + struct_size(dctx, sg, size_add(n_sgin, n_sgout)),
14911491
sk->sk_allocation);
14921492
if (!mem) {
14931493
err = -ENOMEM;

0 commit comments

Comments
 (0)