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

Tighten IP address check, prevent '..' from being passed

Browse Source 
from the check.

Submitted by:	Ren Zhen <bg1tpt gmail com>
MFC after:	2 weeks
This commit is contained in:
Xin LI 2007-05-17 06:08:42 +00:00
parent 01be5be136
commit cbfaeb5fe3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/sysinstall/tcpip.c
View File

@ -122,7 +122,7 @@ static int
verifyIP(char *ip, unsigned long *mask, unsigned long *out)
{
long a, b, c, d;
char *endptr;
char *endptr, *endptr_prev;
unsigned long parsedip;
unsigned long max_addr = (255 << 24) | (255 << 16) | (255 << 8) | 255;
@ -130,16 +130,19 @@ verifyIP(char *ip, unsigned long *mask, unsigned long *out)
if (ip == NULL)
return 0;
a = strtol(ip, &endptr, 10);
if (*endptr++ != '.')
if (endptr - ip == 0 || *endptr++ != '.')
return 0;
endptr_prev = endptr;
b = strtol(endptr, &endptr, 10);
if (*endptr++ != '.')
if (endptr - endptr_prev == 0 || *endptr++ != '.')
return 0;
endptr_prev = endptr;
c = strtol(endptr, &endptr, 10);
if (*endptr++ != '.')
if (endptr - endptr_prev == 0 || *endptr++ != '.')
return 0;
endptr_prev = endptr;
d = strtol(endptr, &endptr, 10);
if (*endptr != '\0')
if (*endptr != '\0' || endptr - endptr_prev == 0)
return 0;
if (!_validByte(a) || !_validByte(b) || !_validByte(c) || !_validByte(d))
return 0;