]> xenbits.xensource.com Git - people/royger/freebsd.git/commitdiff
pf: Avoid leaking pad bytes in struct pfr_astats when copying out
authorMark Johnston <markj@FreeBSD.org>
Tue, 1 Jun 2021 14:56:23 +0000 (10:56 -0400)
committerMark Johnston <markj@FreeBSD.org>
Tue, 1 Jun 2021 23:37:50 +0000 (19:37 -0400)
There is padding between pfr_astats.pfras_a and pfras_packets that was
not getting initialized.

Reported by: KMSAN
Reviewed by: kp, imp
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D30585

sys/netpfil/pf/pf_table.c

index af2f614c9e8ceb4dddbb7ac96f0cc663c398adff..f643790ff6207011f03be00aa29deda3808c6943 100644 (file)
@@ -1028,6 +1028,7 @@ pfr_copyout_astats(struct pfr_astats *as, const struct pfr_kentry *ke,
        int dir, op;
        const struct pfr_kcounters *kc = &ke->pfrke_counters;
 
+       bzero(as, sizeof(*as));
        pfr_copyout_addr(&as->pfras_a, ke);
        as->pfras_tzero = kc->pfrkc_tzero;