Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a29d0fb authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Torvalds
Browse files

relay: check array offset before using it 

Smatch complains that we started using the array offset before we
checked that it was valid.

Fixes: 017c59c0 ('relay: Use per CPU constructs for the relay channel buffer pointers')
Link: http://lkml.kernel.org/r/20161013084947.GC16198@mwanda


Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bd4171a5

kernel/relay.c

+2 −2
Original line number Diff line number Diff line
@@ -809,11 +809,11 @@ void relay_subbufs_consumed(struct rchan *chan, 
{

	struct rchan_buf *buf;



	if (!chan)

	if (!chan || cpu >= NR_CPUS)

		return;



	buf = *per_cpu_ptr(chan->buf, cpu);

	if (cpu >= NR_CPUS || !buf || subbufs_consumed > chan->n_subbufs)

	if (!buf || subbufs_consumed > chan->n_subbufs)

		return;



	if (subbufs_consumed > buf->subbufs_produced - buf->subbufs_consumed)