|
 |
c01703 |
From d062793e7aebde3ffee796dfd4180716632ae444 Mon Sep 17 00:00:00 2001
|
|
|
c01703 |
From: Jean Delvare <jdelvare@suse.de>
|
|
|
c01703 |
Date: Wed, 8 Nov 2017 22:17:43 +0100
|
|
|
c01703 |
Subject: [PATCH 2/3] tools: i2cbusses: Check the return value of snprintf
|
|
|
c01703 |
MIME-Version: 1.0
|
|
|
c01703 |
Content-Type: text/plain; charset=UTF-8
|
|
|
c01703 |
Content-Transfer-Encoding: 8bit
|
|
|
c01703 |
|
|
|
c01703 |
It's very unlikely that these paths will ever be truncated, but
|
|
|
c01703 |
better safe than sorry.
|
|
|
c01703 |
|
|
|
c01703 |
Suggested by Uwe Kleine-König.
|
|
|
c01703 |
---
|
|
|
c01703 |
tools/i2cbusses.c | 34 ++++++++++++++++++++++++++++------
|
|
|
c01703 |
1 file changed, 28 insertions(+), 6 deletions(-)
|
|
|
c01703 |
|
|
|
c01703 |
diff --git a/tools/i2cbusses.c b/tools/i2cbusses.c
|
|
|
c01703 |
index cb78cc7..41f5b6b 100644
|
|
|
c01703 |
--- a/tools/i2cbusses.c
|
|
|
c01703 |
+++ b/tools/i2cbusses.c
|
|
|
c01703 |
@@ -137,7 +137,7 @@ struct i2c_adap *gather_i2c_busses(void)
|
|
|
c01703 |
FILE *f;
|
|
|
c01703 |
char fstype[NAME_MAX], sysfs[NAME_MAX], n[NAME_MAX];
|
|
|
c01703 |
int foundsysfs = 0;
|
|
|
c01703 |
- int count=0;
|
|
|
c01703 |
+ int len, count = 0;
|
|
|
c01703 |
struct i2c_adap *adapters;
|
|
|
c01703 |
|
|
|
c01703 |
adapters = calloc(BUNCH, sizeof(struct i2c_adap));
|
|
|
c01703 |
@@ -220,18 +220,32 @@ struct i2c_adap *gather_i2c_busses(void)
|
|
|
c01703 |
|
|
|
c01703 |
/* this should work for kernels 2.6.5 or higher and */
|
|
|
c01703 |
/* is preferred because is unambiguous */
|
|
|
c01703 |
- snprintf(n, NAME_MAX, "%s/%s/name", sysfs, de->d_name);
|
|
|
c01703 |
+ len = snprintf(n, NAME_MAX, "%s/%s/name", sysfs, de->d_name);
|
|
|
c01703 |
+ if (len >= NAME_MAX) {
|
|
|
c01703 |
+ fprintf(stderr, "%s: path truncated\n", n);
|
|
|
c01703 |
+ continue;
|
|
|
c01703 |
+ }
|
|
|
c01703 |
f = fopen(n, "r");
|
|
|
c01703 |
/* this seems to work for ISA */
|
|
|
c01703 |
if(f == NULL) {
|
|
|
c01703 |
- snprintf(n, NAME_MAX, "%s/%s/device/name", sysfs, de->d_name);
|
|
|
c01703 |
+ len = snprintf(n, NAME_MAX, "%s/%s/device/name", sysfs,
|
|
|
c01703 |
+ de->d_name);
|
|
|
c01703 |
+ if (len >= NAME_MAX) {
|
|
|
c01703 |
+ fprintf(stderr, "%s: path truncated\n", n);
|
|
|
c01703 |
+ continue;
|
|
|
c01703 |
+ }
|
|
|
c01703 |
f = fopen(n, "r");
|
|
|
c01703 |
}
|
|
|
c01703 |
/* non-ISA is much harder */
|
|
|
c01703 |
/* and this won't find the correct bus name if a driver
|
|
|
c01703 |
has more than one bus */
|
|
|
c01703 |
if(f == NULL) {
|
|
|
c01703 |
- snprintf(n, NAME_MAX, "%s/%s/device", sysfs, de->d_name);
|
|
|
c01703 |
+ len = snprintf(n, NAME_MAX, "%s/%s/device", sysfs,
|
|
|
c01703 |
+ de->d_name);
|
|
|
c01703 |
+ if (len >= NAME_MAX) {
|
|
|
c01703 |
+ fprintf(stderr, "%s: path truncated\n", n);
|
|
|
c01703 |
+ continue;
|
|
|
c01703 |
+ }
|
|
|
c01703 |
if(!(ddir = opendir(n)))
|
|
|
c01703 |
continue;
|
|
|
c01703 |
while ((dde = readdir(ddir)) != NULL) {
|
|
|
c01703 |
@@ -240,8 +254,16 @@ struct i2c_adap *gather_i2c_busses(void)
|
|
|
c01703 |
if (!strcmp(dde->d_name, ".."))
|
|
|
c01703 |
continue;
|
|
|
c01703 |
if ((!strncmp(dde->d_name, "i2c-", 4))) {
|
|
|
c01703 |
- snprintf(n, NAME_MAX, "%s/%s/device/%s/name",
|
|
|
c01703 |
- sysfs, de->d_name, dde->d_name);
|
|
|
c01703 |
+ len = snprintf(n, NAME_MAX,
|
|
|
c01703 |
+ "%s/%s/device/%s/name",
|
|
|
c01703 |
+ sysfs, de->d_name,
|
|
|
c01703 |
+ dde->d_name);
|
|
|
c01703 |
+ if (len >= NAME_MAX) {
|
|
|
c01703 |
+ fprintf(stderr,
|
|
|
c01703 |
+ "%s: path truncated\n",
|
|
|
c01703 |
+ n);
|
|
|
c01703 |
+ continue;
|
|
|
c01703 |
+ }
|
|
|
c01703 |
if((f = fopen(n, "r")))
|
|
|
c01703 |
goto found;
|
|
|
c01703 |
}
|
|
|
c01703 |
--
|
|
|
c01703 |
2.14.3
|
|
|
c01703 |
|