diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 19:55:17 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 19:55:17 +0100 |
| commit | b675b3667f6729dcd1036a2a129b35445947f905 (patch) | |
| tree | 0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /kernel/relay.c | |
| parent | Input: max8925_onkey - avoid accessing input device too early (diff) | |
| parent | Linux 3.3-rc6 (diff) | |
| download | linux-b675b3667f6729dcd1036a2a129b35445947f905.tar.xz linux-b675b3667f6729dcd1036a2a129b35445947f905.zip | |
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'kernel/relay.c')
| -rw-r--r-- | kernel/relay.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index 226fade4d727..ab56a1764d4d 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; @@ -302,7 +306,7 @@ static void buf_unmapped_default_callback(struct rchan_buf *buf, */ static struct dentry *create_buf_file_default_callback(const char *filename, struct dentry *parent, - int mode, + umode_t mode, struct rchan_buf *buf, int *is_global) { @@ -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) |