d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify the code a little bit using the update_sensor_sysctl() routine to

Browse Source 
retrieve the sensor temperature.

This also avoid the overflow that could happen on sysctlnametomib(3)
because the code was not checking the length of the mib array.

CID:		1222504
This commit is contained in:
Luiz Otavio O Souza 2014-06-27 18:58:22 +00:00
parent 75ad9daa46
commit 646707db80
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=267971
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
View File

@ -172,7 +172,7 @@ sysctlgetnext(int *oid, int nlen, int *next, size_t *nextlen)
} }
static int static int
update_sensor_sysctl(char *obuf, size_t *obuflen, int idx, const char *name) update_sensor_sysctl(void *obuf, size_t *obuflen, int idx, const char *name)
{ {
char buf[LM75BUF]; char buf[LM75BUF];
int mib[5]; int mib[5];
@ -213,22 +213,18 @@ update_sensor(struct lm75_snmp_sensor *sensor, int idx)
} }
static int static int
add_sensor(char *buf, size_t nlen) add_sensor(char *buf)
{ {
int idx, mib[5], temp; int idx, temp;
size_t len; size_t len;
struct lm75_snmp_sensor *sensor; struct lm75_snmp_sensor *sensor;
if (sscanf(buf, "dev.lm75.%d.temperature", &idx) != 1) if (sscanf(buf, "dev.lm75.%d.temperature", &idx) != 1)
return (-1); return (-1);
/* Fill out the mib information. */
if (sysctlnametomib(buf, mib, &nlen) == -1)
return (-1);
/* Read the sensor temperature. */ /* Read the sensor temperature. */
len = sizeof(temp); len = sizeof(temp);
if (sysctl(mib, nlen, &temp, &len, NULL, 0) == -1) if (update_sensor_sysctl(&temp, &len, idx, "temperature") != 0)
return (-1); return (-1);
/* Add the sensor data to the table. */ /* Add the sensor data to the table. */
@ -326,7 +322,7 @@ update_sensors(void)
continue; continue;
if (strstr(buf, "temperature")) if (strstr(buf, "temperature"))
if (add_sensor(buf, len) != 0) { if (add_sensor(buf) != 0) {
free(oid); free(oid);
return (-1); return (-1);
} }