matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

zebra: don't try to read past EOF

Browse source 
`FILE *` objects are theoretically in an invalid state if you try to use
them past their reporting EOF.  Adjust the code to make it correct.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2024-10-16 12:52:48 +02:00
parent e8006bc2cb
commit 1350f8d1c1
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
zebra/ipforward_proc.c
View file

@ -17,10 +17,15 @@ extern struct zebra_privs_t zserv_privs;
static const char proc_net_snmp[] = "/proc/net/snmp"; static const char proc_net_snmp[] = "/proc/net/snmp";
static void dropline(FILE *fp) static bool dropline(FILE *fp)
{ {
while (getc(fp) != '\n') int ch;
;
do {
ch = getc(fp);
} while (ch != EOF && ch != '\n');
return ch != EOF;
} }
int ipforward(void) int ipforward(void)
@ -36,7 +41,10 @@ int ipforward(void)
return -1; return -1;
/* We don't care about the first line. */ /* We don't care about the first line. */
dropline(fp); if (!dropline(fp)) {
fclose(fp);
return 0;
}
/* Get ip_statistics.IpForwarding : /* Get ip_statistics.IpForwarding :
1 => ip forwarding enabled 1 => ip forwarding enabled