Add checks for fgets() when reading proc

If expected proc headers are missing, catch and print error.

diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index f0db5aa04c98b5bae354b2dd1d9009c6b55e3b09..b08723a85df5fd3d4ec6ac6d3af10dd46046f3c2 100644 (file)
--- a/ip/ip6tunnel.c
+++ b/ip/ip6tunnel.c
@@ -262,8 +262,11 @@ static int do_tunnels_list(struct ip6_tnl_parm *p)
        }
 
        /* skip two lines at the begenning of the file */
-       fgets(buf, sizeof(buf), fp);
-       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) {
                char name[IFNAMSIZ];

diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
index 44ffdfcfa253c56be6c3e3860ab1e504e81f4f3e..ec326bc007454419962b5f707cc93ecb46698b05 100644 (file)
--- a/ip/ipmaddr.c
+++ b/ip/ipmaddr.c
@@ -128,7 +128,8 @@ void read_igmp(struct ma_info **result_p)
        if (!fp)
                return;
        memset(&m, 0, sizeof(m));
-       fgets(buf, sizeof(buf), fp);
+       if (!fgets(buf, sizeof(buf), fp))
+               return;
 
        m.addr.family = AF_INET;
        m.addr.bitlen = 32;

diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index 977143cc3dfa9495e3277224473fc9d7f45409ec..a4389f578786c0d3d4fd193168b51b7d499e0f5e 100644 (file)
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -58,7 +58,8 @@ static void read_viftable(void)
        if (!fp)
                return;
 
-       fgets(buf, sizeof(buf), fp);
+       if (!fgets(buf, sizeof(buf), fp))
+               return;
 
        while (fgets(buf, sizeof(buf), fp)) {
                int vifi;
@@ -83,7 +84,8 @@ static void read_mroute_list(FILE *ofp)
        if (!fp)
                return;
 
-       fgets(buf, sizeof(buf), fp);
+       if (!fgets(buf, sizeof(buf), fp))
+               return;
 
        while (fgets(buf, sizeof(buf), fp)) {
                inet_prefix maddr, msrc;

diff --git a/ip/iptunnel.c b/ip/iptunnel.c
index fe5e3f968855648700cd1d5ac8ce15b27ba9d282..f038f0a6a77f9edce6ce64e3de99953db7d27f06 100644 (file)
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -407,8 +407,12 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
                return -1;
        }
 
-       fgets(buf, sizeof(buf), fp);
-       fgets(buf, sizeof(buf), fp);
+       /* skip header lines */
+       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) {
                int index, type;