diff options
Diffstat (limited to 'kernel/relay.c')
| -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 4335e1d7ee2..ab56a1764d4 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)  |