Date: Tue, 8 Jun 2021 13:38:02 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 5a7d63129a67 - stable/13 - pf: Avoid leaking pad bytes in struct pfr_astats when copying out Message-ID: <202106081338.158Dc2Nr074915@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5a7d63129a67ab5b343ef3054fa1ac4122218506 commit 5a7d63129a67ab5b343ef3054fa1ac4122218506 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2021-06-01 14:56:23 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-06-08 13:27:07 +0000 pf: Avoid leaking pad bytes in struct pfr_astats when copying out There is padding between pfr_astats.pfras_a and pfras_packets that was not getting initialized. Reported by: KMSAN Reviewed by: kp, imp Sponsored by: The FreeBSD Foundation (cherry picked from commit 60a38abb8982e11ee71559057dd7128bd097043e) --- sys/netpfil/pf/pf_table.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index af2f614c9e8c..f643790ff620 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106081338.158Dc2Nr074915>