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

Fix fallout from r236397 in pfr_update_stats(), that was missed

Browse Source 
later in r237155. We need to zero sockaddr before lookup. While
here, make pfr_update_stats() panic on unknown af.
This commit is contained in:
Gleb Smirnoff 2012-09-22 10:02:44 +00:00
parent 9b42038b8a
commit 7348c5240d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/netpfil/pf/pf_table.c
View File

@ -1954,6 +1954,7 @@ pfr_update_stats(struct pfr_ktable *kt, struct pf_addr *a, sa_family_t af,
{ {
struct sockaddr_in sin; struct sockaddr_in sin;
bzero(&sin, sizeof(sin));
sin.sin_len = sizeof(sin); sin.sin_len = sizeof(sin);
sin.sin_family = AF_INET; sin.sin_family = AF_INET;
sin.sin_addr.s_addr = a->addr32[0]; sin.sin_addr.s_addr = a->addr32[0];
@ -1968,6 +1969,7 @@ pfr_update_stats(struct pfr_ktable *kt, struct pf_addr *a, sa_family_t af,
{ {
struct sockaddr_in6 sin6; struct sockaddr_in6 sin6;
bzero(&sin6, sizeof(sin6));
sin6.sin6_len = sizeof(sin6); sin6.sin6_len = sizeof(sin6);
sin6.sin6_family = AF_INET6; sin6.sin6_family = AF_INET6;
bcopy(a, &sin6.sin6_addr, sizeof(sin6.sin6_addr)); bcopy(a, &sin6.sin6_addr, sizeof(sin6.sin6_addr));
@ -1978,7 +1980,7 @@ pfr_update_stats(struct pfr_ktable *kt, struct pf_addr *a, sa_family_t af,
} }
#endif /* INET6 */ #endif /* INET6 */
default: default:
; panic("%s: unknown address family %u", __func__, af);
} }
if ((ke == NULL || ke->pfrke_not) != notrule) { if ((ke == NULL || ke->pfrke_not) != notrule) {
if (op_pass != PFR_OP_PASS) if (op_pass != PFR_OP_PASS)