diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-02-10 09:03:58 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-03-17 14:03:58 +0100 |
| commit | aa6333a71faab8a2c4cddd883e252987d19c7bcc (patch) | |
| tree | 2ce314f42da478b4f902320db11488b8c43b87ad | |
| parent | 15edbd9f8b8695868cf2d98f691264e058fbc2b7 (diff) | |
| download | linux-stable-aa6333a71faab8a2c4cddd883e252987d19c7bcc.tar.gz linux-stable-aa6333a71faab8a2c4cddd883e252987d19c7bcc.tar.bz2 linux-stable-aa6333a71faab8a2c4cddd883e252987d19c7bcc.zip | |
relay: prevent integer overflow in relay_open()
commit f6302f1bcd75a042df69866d98b8d775a668f8f1 upstream.
"subbuf_size" and "n_subbufs" come from the user and they need to be
capped to prevent an integer overflow.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | kernel/relay.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index b0bbf6ffd199..2da66c54dff6 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -171,10 +171,14 @@ depopulate: */ static struct rchan_buf *relay_create_buf(struct rchan *chan) { - struct rchan_buf *buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL); - if (!buf) + struct rchan_buf *buf; + + if (chan->n_subbufs > UINT_MAX / sizeof(size_t *)) return NULL; + buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL); + if (!buf) + return NULL; buf->padding = kmalloc(chan->n_subbufs * sizeof(size_t *), GFP_KERNEL); if (!buf->padding) goto free_buf; @@ -581,6 +585,8 @@ struct rchan *relay_open(const char *base_filename, if (!(subbuf_size && n_subbufs)) return NULL; + if (subbuf_size > UINT_MAX / n_subbufs) + return NULL; chan = kzalloc(sizeof(struct rchan), GFP_KERNEL); if (!chan) |