aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOscar Carter <oscar.carter@gmx.com>2020-05-01 17:51:18 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-05 12:36:05 +0200
commit769acc3656d93aaacada814939743361d284fd87 (patch)
tree6b5ca38f70eb00ca8bac12d35abc41164f94892f
parent3c5c0805ac925f2f8c68eeb1ba0f8a796a7b4525 (diff)
downloadprintk-769acc3656d93aaacada814939743361d284fd87.tar.gz
staging: gasket: Check the return value of gasket_get_bar_index()
Check the return value of gasket_get_bar_index function as it can return a negative one (-EINVAL). If this happens, a negative index is used in the "gasket_dev->bar_data" array. Addresses-Coverity-ID: 1438542 ("Negative array index read") Fixes: 9a69f5087ccc2 ("drivers/staging: Gasket driver framework + Apex driver") Signed-off-by: Oscar Carter <oscar.carter@gmx.com> Cc: stable <stable@vger.kernel.org> Reviewed-by: Richard Yeh <rcy@google.com> Link: https://lore.kernel.org/r/20200501155118.13380-1-oscar.carter@gmx.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/gasket/gasket_core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c
index 8e0575fcb4c8c..67325fbaf7605 100644
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -925,6 +925,10 @@ do_map_region(const struct gasket_dev *gasket_dev, struct vm_area_struct *vma,
gasket_get_bar_index(gasket_dev,
(vma->vm_pgoff << PAGE_SHIFT) +
driver_desc->legacy_mmap_address_offset);
+
+ if (bar_index < 0)
+ return DO_MAP_REGION_INVALID;
+
phys_base = gasket_dev->bar_data[bar_index].phys_base + phys_offset;
while (mapped_bytes < map_length) {
/*