matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add checks for fgets() when reading proc 

If expected proc headers are missing, catch and print error.
This commit is contained in:
Stephen Hemminger 2011-03-09 10:41:09 -08:00 committed by Stephen Hemminger
parent 46dc73a57d
commit 38c867d2a8
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ip/ip6tunnel.c
View File

@ -262,8 +262,11 @@ static int do_tunnels_list(struct ip6_tnl_parm *p)
} }
/* skip two lines at the begenning of the file */ /* skip two lines at the begenning of the file */
fgets(buf, sizeof(buf), fp); if (!fgets(buf, sizeof(buf), fp) ||
fgets(buf, sizeof(buf), fp); !fgets(buf, sizeof(buf), fp)) {
fprintf(stderr, "/proc/net/dev read error\n");
return -1;
}
while (fgets(buf, sizeof(buf), fp) != NULL) { while (fgets(buf, sizeof(buf), fp) != NULL) {
char name[IFNAMSIZ]; char name[IFNAMSIZ];

3
ip/ipmaddr.c
View File

@ -128,7 +128,8 @@ void read_igmp(struct ma_info **result_p)
if (!fp) if (!fp)
return; return;
memset(&m, 0, sizeof(m)); memset(&m, 0, sizeof(m));
fgets(buf, sizeof(buf), fp); if (!fgets(buf, sizeof(buf), fp))
return;
m.addr.family = AF_INET; m.addr.family = AF_INET;
m.addr.bitlen = 32; m.addr.bitlen = 32;

6
ip/ipmroute.c
View File

@ -58,7 +58,8 @@ static void read_viftable(void)
if (!fp) if (!fp)
return; return;
fgets(buf, sizeof(buf), fp); if (!fgets(buf, sizeof(buf), fp))
return;
while (fgets(buf, sizeof(buf), fp)) { while (fgets(buf, sizeof(buf), fp)) {
int vifi; int vifi;
@ -83,7 +84,8 @@ static void read_mroute_list(FILE *ofp)
if (!fp) if (!fp)
return; return;
fgets(buf, sizeof(buf), fp); if (!fgets(buf, sizeof(buf), fp))
return;
while (fgets(buf, sizeof(buf), fp)) { while (fgets(buf, sizeof(buf), fp)) {
inet_prefix maddr, msrc; inet_prefix maddr, msrc;

8
ip/iptunnel.c
View File

@ -407,8 +407,12 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
return -1; return -1;
} }
fgets(buf, sizeof(buf), fp); /* skip header lines */
fgets(buf, sizeof(buf), fp); if (!fgets(buf, sizeof(buf), fp) ||
!fgets(buf, sizeof(buf), fp)) {
fprintf(stderr, "/proc/net/dev read error\n");
return -1;
}
while (fgets(buf, sizeof(buf), fp) != NULL) { while (fgets(buf, sizeof(buf), fp) != NULL) {
int index, type; int index, type;