mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
ebbeb55561
Also add script used to generate patches and SRC_URI Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
From 161d5e5d75409a789dce0fce2efde84af0d39a2c Mon Sep 17 00:00:00 2001
|
|
From: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Date: Fri, 10 Feb 2012 09:03:58 +0100
|
|
Subject: [PATCH 13/30] 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>
|
|
---
|
|
kernel/relay.c | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/kernel/relay.c b/kernel/relay.c
|
|
index 226fade..b6f803a 100644
|
|
--- a/kernel/relay.c
|
|
+++ b/kernel/relay.c
|
|
@@ -164,10 +164,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;
|
|
@@ -574,6 +578,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)
|
|
--
|
|
1.7.9.4
|
|
|