From: Kees Cook <keescook@chromium.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>,
Peter Rosin <peda@axentia.se>, Wolfram Sang <wsa@kernel.org>,
"Gustavo A. R. Silva" <gustavo@embeddedor.com>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org, linux-hardening@vger.kernel.org
Subject: Re: [PATCH] i2c: mux: harden i2c_mux_alloc() against integer overflows
Date: Fri, 16 Sep 2022 06:31:45 -0700 [thread overview]
Message-ID: <202209160630.CF7AE9708D@keescook> (raw)
In-Reply-To: <YyQyfaI0WCsQ8F48@kadam>
On Fri, Sep 16, 2022 at 11:23:25AM +0300, Dan Carpenter wrote:
> [...]
> net/ipv6/mcast.c:450 ip6_mc_source() saving 'size_add' to type 'int'
Interesting! Are you able to report the consumer? e.g. I think a bunch
of these would be fixed by:
diff --git a/net/core/sock.c b/net/core/sock.c
index 4cb957d934a2..f004c4d411e3 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2552,10 +2552,11 @@ struct sk_buff *sock_omalloc(struct sock *sk, unsigned long size,
/*
* Allocate a memory block from the socket's option memory buffer.
*/
-void *sock_kmalloc(struct sock *sk, int size, gfp_t priority)
+void *sock_kmalloc(struct sock *sk, size_t size, gfp_t priority)
{
- if ((unsigned int)size <= sysctl_optmem_max &&
- atomic_read(&sk->sk_omem_alloc) + size < sysctl_optmem_max) {
+ if (size > INT_MAX || size > sysctl_optmem_max)
+ return NULL;
+ if (atomic_read(&sk->sk_omem_alloc) < sysctl_optmem_max - size) {
void *mem;
/* First do the add, to avoid the race if kmalloc
* might sleep.
--
Kees Cook
next prev parent reply other threads:[~2022-09-16 13:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 11:30 [PATCH] i2c: mux: harden i2c_mux_alloc() against integer overflows Dan Carpenter
2022-09-15 13:36 ` Peter Rosin
2022-09-15 13:51 ` Gustavo A. R. Silva
2022-09-15 14:09 ` Dan Carpenter
2022-09-16 8:07 ` Kees Cook
2022-09-16 8:23 ` Dan Carpenter
2022-09-16 13:31 ` Kees Cook [this message]
2022-09-16 14:55 ` Dan Carpenter
2022-09-16 21:31 ` Kees Cook
2022-09-16 8:01 ` Kees Cook
2022-09-16 8:20 ` Dan Carpenter
2022-09-16 19:31 ` Wolfram Sang
2022-09-19 6:35 ` Dan Carpenter
2022-09-21 20:13 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202209160630.CF7AE9708D@keescook \
--to=keescook@chromium.org \
--cc=dan.carpenter@oracle.com \
--cc=gustavo@embeddedor.com \
--cc=gustavoars@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peda@axentia.se \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox