diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-12-14 18:05:38 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-12 05:39:30 -0500 |
commit | c4c11b4bdbf684540f9baf9f17fc1c7fb688f1fb (patch) | |
tree | 6d65c2c80acf9a15c60f2c3f167fa8d492484d84 | |
parent | 3dd50a5e2be97d1c68545a44851be97294bfdcc7 (diff) |
relay: check array offset before using it
commit 9a29d0fbc2d9ad99fb8a981ab72548cc360e9d4c upstream.
Smatch complains that we started using the array offset before we
checked that it was valid.
Fixes: 017c59c042d0 ('relay: Use per CPU constructs for the relay channel buffer pointers')
Link: http://lkml.kernel.org/r/20161013084947.GC16198@mwanda
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | kernel/relay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index da79a109dbeb..8f18d314a96a 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
@@ -809,11 +809,11 @@ void relay_subbufs_consumed(struct rchan *chan, | |||
809 | { | 809 | { |
810 | struct rchan_buf *buf; | 810 | struct rchan_buf *buf; |
811 | 811 | ||
812 | if (!chan) | 812 | if (!chan || cpu >= NR_CPUS) |
813 | return; | 813 | return; |
814 | 814 | ||
815 | buf = *per_cpu_ptr(chan->buf, cpu); | 815 | buf = *per_cpu_ptr(chan->buf, cpu); |
816 | if (cpu >= NR_CPUS || !buf || subbufs_consumed > chan->n_subbufs) | 816 | if (!buf || subbufs_consumed > chan->n_subbufs) |
817 | return; | 817 | return; |
818 | 818 | ||
819 | if (subbufs_consumed > buf->subbufs_produced - buf->subbufs_consumed) | 819 | if (subbufs_consumed > buf->subbufs_produced - buf->subbufs_consumed) |