emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: Cater for 32 char device names

Browse Source 
The new library has this boundary set in a define.
Also fixed the off-by-one problem with the buffer and scanf

References:
 commit 1794875ab6
This commit is contained in:
Craig Small 2016-07-02 15:01:11 +10:00
parent 5e9c522eea
commit 96e6600c84
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proc/diskstat.c
View File

@ -34,12 +34,12 @@
#include "procps-private.h" #include "procps-private.h"
#define DISKSTAT_LINE_LEN 1024 #define DISKSTAT_LINE_LEN 1024
#define DISKSTAT_NAME_LEN 15 #define DISKSTAT_NAME_LEN 34
#define DISKSTAT_FILE "/proc/diskstats" #define DISKSTAT_FILE "/proc/diskstats"
#define SYSBLOCK_DIR "/sys/block" #define SYSBLOCK_DIR "/sys/block"
struct procps_diskstat_dev { struct procps_diskstat_dev {
char name[DISKSTAT_NAME_LEN]; char name[DISKSTAT_NAME_LEN+1];
int is_disk; int is_disk;
unsigned long reads; unsigned long reads;
unsigned long reads_merged; unsigned long reads_merged;
@ -186,7 +186,7 @@ PROCPS_EXPORT int procps_diskstat_read (
{ {
int retval; int retval;
char buf[DISKSTAT_LINE_LEN]; char buf[DISKSTAT_LINE_LEN];
char devname[DISKSTAT_NAME_LEN]; char devname[DISKSTAT_NAME_LEN+1];
struct procps_diskstat_dev *disk; struct procps_diskstat_dev *disk;
/* clear/zero structures */ /* clear/zero structures */