lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [day] [month] [year] [list]
Date:	Sat, 13 Dec 2014 01:54:40 +0100
From:	Thomas Jarosch <thomas.jarosch@...ra2net.com>
To:	Jorge Eduardo Candelaria <jedu@...mlogic.co.uk>
CC:	linux-kernel@...r.kernel.org
Subject: [RFC PATCH, untested] Fix off-by-one in tps_comparators[] access

The array tps_comparators starts at zero,
yet COMP1 starts at 1. So COMP2 is out of bounds.

cppcheck reported:
[drivers/mfd/tps65911-comparator.c:61]: (error) Array 'tps_comparators[2]' accessed at index 2, which is out of bounds.
[drivers/mfd/tps65911-comparator.c:88]: (error) Array 'tps_comparators[2]' accessed at index 2, which is out of bounds.

Signed-off-by: Thomas Jarosch <thomas.jarosch@...ra2net.com>
---
 drivers/mfd/tps65911-comparator.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c
index c0816eb..e8c2e32 100644
--- a/drivers/mfd/tps65911-comparator.c
+++ b/drivers/mfd/tps65911-comparator.c
@@ -58,13 +58,14 @@ static struct comparator tps_comparators[] = {
 
 static int comp_threshold_set(struct tps65910 *tps65910, int id, int voltage)
 {
-	struct comparator tps_comp = tps_comparators[id];
+	struct comparator tps_comp;
 	int curr_voltage = 0;
 	int ret;
 	u8 index = 0, val;
 
-	if (id == COMP)
+	if (id == COMP || id > COMP2)
 		return 0;
+	tps_comp = tps_comparators[id-1];
 
 	while (curr_voltage < tps_comp.uV_max) {
 		curr_voltage = tps_comp.vsel_table[index];
@@ -85,12 +86,13 @@ static int comp_threshold_set(struct tps65910 *tps65910, int id, int voltage)
 
 static int comp_threshold_get(struct tps65910 *tps65910, int id)
 {
-	struct comparator tps_comp = tps_comparators[id];
+	struct comparator tps_comp;
 	int ret;
 	u8 val;
 
-	if (id == COMP)
+	if (id == COMP || id > COMP2)
 		return 0;
+	tps_comp = tps_comparators[id-1];
 
 	ret = tps65910->read(tps65910, tps_comp.reg, 1, &val);
 	if (ret < 0)
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists