diff options
| author | Gustavo A. R. Silva <gustavoars@kernel.org> | 2023-09-15 21:12:38 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-09-18 10:37:23 +0200 |
| commit | a2713257ee2be22827d7bc248302d408c91bfb95 (patch) | |
| tree | e8508398caef6cdeb5badf494831d06bf6f497fc /net/tls | |
| parent | mlxsw: Use size_mul() in call to struct_size() (diff) | |
| download | linux-a2713257ee2be22827d7bc248302d408c91bfb95.tar.xz linux-a2713257ee2be22827d7bc248302d408c91bfb95.zip | |
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: b89fec54fd61 ("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>
Diffstat (limited to 'net/tls')
| -rw-r--r-- | net/tls/tls_sw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index d1fc295b83b5..270712b8d391 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -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; |