diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-02-23 19:14:04 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-02-23 19:14:04 +0100 |
| commit | c2992053ecfdfaece14dca77c6cf290cc8c9d8b7 (patch) | |
| tree | 77afad37928d6d862049107cd9b8e8f671692615 /kernel | |
| parent | 7af73db401730ad084a96eb6838f2f1ffe7975e7 (diff) | |
| parent | a4a663513af05a98d6085d92f85c16bb64ac4050 (diff) | |
| download | kernel_samsung_crespo-c2992053ecfdfaece14dca77c6cf290cc8c9d8b7.zip kernel_samsung_crespo-c2992053ecfdfaece14dca77c6cf290cc8c9d8b7.tar.gz kernel_samsung_crespo-c2992053ecfdfaece14dca77c6cf290cc8c9d8b7.tar.bz2 | |
Merge branch 'linux-3.0.y' into cm.ics
Diffstat (limited to 'kernel')
| -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 859ea5a..2c242fb 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) |