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

sbin/ipfw: Fix parsing error in table based forward

Browse Source 
The argument parser does not recognise the optional port for an
"tablearg" argument.  Fix simplifies the code by make the internal
representation expicit for the parser.

PR:		252744
MFC:		1 week
Reported by:	<bugs.freebsd.org@mx.zzux.com>
Approved by:	nc
Tested by:	<bugs.freebsd.org@mx.zzux.com>
Differential Revision: https://reviews.freebsd.org/D30164
This commit is contained in:
Lutz Donnerhacke 2021-05-07 20:59:34 +02:00
parent 9146c6240d
commit 6cb13813ca
1 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
sbin/ipfw/ipfw2.c
View File

@ -4021,57 +4021,54 @@ compile_rule(char *av[], uint32_t *rbuf, int *rbufsize, struct tidx *tstate)
NEED1("missing forward address[:port]");
if (_substrcmp(*av, "tablearg") == 0) {
family = PF_INET;
((struct sockaddr_in*)&result)->sin_addr.s_addr =
INADDR_ANY;
} else {
/*
* Are we an bracket-enclosed IPv6 address?
*/
if (strchr(*av, '['))
(*av)++;
if (strncmp(*av, "tablearg", 8) == 0)
memcpy(++(*av), "0.0.0.0", 7);
/*
* locate the address-port separator (':' or ',')
*/
s = strchr(*av, ',');
if (s == NULL) {
s = strchr(*av, ']');
/* Prevent erroneous parsing on brackets. */
if (s != NULL)
*(s++) = '\0';
else
s = *av;
/*
* Are we an bracket-enclosed IPv6 address?
*/
if (strchr(*av, '['))
(*av)++;
/* Distinguish between IPv4:port and IPv6 cases. */
s = strchr(s, ':');
if (s && strchr(s+1, ':'))
s = NULL; /* no port */
}
if (s != NULL) {
/* Terminate host portion and set s to start of port. */
/*
* locate the address-port separator (':' or ',')
*/
s = strchr(*av, ',');
if (s == NULL) {
s = strchr(*av, ']');
/* Prevent erroneous parsing on brackets. */
if (s != NULL)
*(s++) = '\0';
i = strtoport(s, &end, 0 /* base */, 0 /* proto */);
if (s == end)
errx(EX_DATAERR,
"illegal forwarding port ``%s''", s);
port_number = (u_short)i;
}
else
s = *av;
/*
* Resolve the host name or address to a family and a
* network representation of the address.
*/
if (getaddrinfo(*av, NULL, NULL, &res))
errx(EX_DATAERR, NULL);
/* Just use the first host in the answer. */
family = res->ai_family;
memcpy(&result, res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
/* Distinguish between IPv4:port and IPv6 cases. */
s = strchr(s, ':');
if (s && strchr(s+1, ':'))
s = NULL; /* no port */
}
if (s != NULL) {
/* Terminate host portion and set s to start of port. */
*(s++) = '\0';
i = strtoport(s, &end, 0 /* base */, 0 /* proto */);
if (s == end)
errx(EX_DATAERR,
"illegal forwarding port ``%s''", s);
port_number = (u_short)i;
}
/*
* Resolve the host name or address to a family and a
* network representation of the address.
*/
if (getaddrinfo(*av, NULL, NULL, &res))
errx(EX_DATAERR, NULL);
/* Just use the first host in the answer. */
family = res->ai_family;
memcpy(&result, res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
if (family == PF_INET) {
ipfw_insn_sa *p = (ipfw_insn_sa *)action;