|
 |
680190f |
From def2845efacab3a3973fb0218ac5077a162f8f1e Mon Sep 17 00:00:00 2001
|
|
|
680190f |
From: Jean Delvare <jdelvare@suse.de>
|
|
|
680190f |
Date: Thu, 2 Nov 2017 16:17:50 +0100
|
|
|
680190f |
Subject: [PATCH 1/3] i2c-tools: i2cbusses: Avoid buffer overflows in sysfs
|
|
|
680190f |
paths
|
|
|
680190f |
|
|
|
680190f |
sprintf isn't safe, use snprintf instead.
|
|
|
680190f |
---
|
|
|
680190f |
CHANGES | 3 +++
|
|
|
680190f |
tools/i2cbusses.c | 10 +++++-----
|
|
|
680190f |
2 files changed, 8 insertions(+), 5 deletions(-)
|
|
|
680190f |
|
|
|
680190f |
diff --git a/CHANGES b/CHANGES
|
|
|
680190f |
index 15ff761..539adb0 100644
|
|
|
680190f |
--- a/CHANGES
|
|
|
680190f |
+++ b/CHANGES
|
|
|
680190f |
@@ -1,6 +1,9 @@
|
|
|
680190f |
i2c-tools CHANGES
|
|
|
680190f |
-----------------
|
|
|
680190f |
|
|
|
680190f |
+master
|
|
|
680190f |
+ tools: Fix potential buffer overflows in i2cbusses
|
|
|
680190f |
+
|
|
|
680190f |
4.0 (2017-10-30)
|
|
|
680190f |
tools: Fix build with recent compilers (gcc 4.6+)
|
|
|
680190f |
Add examples to the manual pages
|
|
|
680190f |
diff --git a/tools/i2cbusses.c b/tools/i2cbusses.c
|
|
|
680190f |
index dad22ea..cb78cc7 100644
|
|
|
680190f |
--- a/tools/i2cbusses.c
|
|
|
680190f |
+++ b/tools/i2cbusses.c
|
|
|
680190f |
@@ -220,18 +220,18 @@ struct i2c_adap *gather_i2c_busses(void)
|
|
|
680190f |
|
|
|
680190f |
/* this should work for kernels 2.6.5 or higher and */
|
|
|
680190f |
/* is preferred because is unambiguous */
|
|
|
680190f |
- sprintf(n, "%s/%s/name", sysfs, de->d_name);
|
|
|
680190f |
+ snprintf(n, NAME_MAX, "%s/%s/name", sysfs, de->d_name);
|
|
|
680190f |
f = fopen(n, "r");
|
|
|
680190f |
/* this seems to work for ISA */
|
|
|
680190f |
if(f == NULL) {
|
|
|
680190f |
- sprintf(n, "%s/%s/device/name", sysfs, de->d_name);
|
|
|
680190f |
+ snprintf(n, NAME_MAX, "%s/%s/device/name", sysfs, de->d_name);
|
|
|
680190f |
f = fopen(n, "r");
|
|
|
680190f |
}
|
|
|
680190f |
/* non-ISA is much harder */
|
|
|
680190f |
/* and this won't find the correct bus name if a driver
|
|
|
680190f |
has more than one bus */
|
|
|
680190f |
if(f == NULL) {
|
|
|
680190f |
- sprintf(n, "%s/%s/device", sysfs, de->d_name);
|
|
|
680190f |
+ snprintf(n, NAME_MAX, "%s/%s/device", sysfs, de->d_name);
|
|
|
680190f |
if(!(ddir = opendir(n)))
|
|
|
680190f |
continue;
|
|
|
680190f |
while ((dde = readdir(ddir)) != NULL) {
|
|
|
680190f |
@@ -240,8 +240,8 @@ struct i2c_adap *gather_i2c_busses(void)
|
|
|
680190f |
if (!strcmp(dde->d_name, ".."))
|
|
|
680190f |
continue;
|
|
|
680190f |
if ((!strncmp(dde->d_name, "i2c-", 4))) {
|
|
|
680190f |
- sprintf(n, "%s/%s/device/%s/name",
|
|
|
680190f |
- sysfs, de->d_name, dde->d_name);
|
|
|
680190f |
+ snprintf(n, NAME_MAX, "%s/%s/device/%s/name",
|
|
|
680190f |
+ sysfs, de->d_name, dde->d_name);
|
|
|
680190f |
if((f = fopen(n, "r")))
|
|
|
680190f |
goto found;
|
|
|
680190f |
}
|
|
|
680190f |
--
|
|
|
680190f |
2.14.3
|
|
|
680190f |
|