Date: Tue, 6 Mar 2012 13:57:28 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r232605 - projects/pf/head/sys/contrib/pf/net Message-ID: <201203061357.q26DvSlB043091@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue Mar 6 13:57:28 2012 New Revision: 232605 URL: http://svn.freebsd.org/changeset/base/232605 Log: Fix error from last change: don't use M_ZERO for a zone with init method. Modified: projects/pf/head/sys/contrib/pf/net/pf.c projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Modified: projects/pf/head/sys/contrib/pf/net/pf.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf.c Tue Mar 6 13:43:57 2012 (r232604) +++ projects/pf/head/sys/contrib/pf/net/pf.c Tue Mar 6 13:57:28 2012 (r232605) @@ -788,7 +788,7 @@ pf_state_key_setup(struct pf_pdesc *pd, KASSERT((*skp == NULL && *nkp == NULL), ("%s: skp == NULL && nkp == NULL", __func__)); - if ((*skp = uma_zalloc(V_pf_state_key_z, M_NOWAIT | M_ZERO)) == NULL) + if ((*skp = uma_zalloc(V_pf_state_key_z, M_NOWAIT)) == NULL) return (ENOMEM); PF_ACPY(&(*skp)->addr[pd->sidx], saddr, pd->af); @@ -799,7 +799,7 @@ pf_state_key_setup(struct pf_pdesc *pd, (*skp)->af = pd->af; if (nr != NULL) { - if ((*nkp = uma_zalloc(V_pf_state_key_z, M_NOWAIT | M_ZERO)) + if ((*nkp = uma_zalloc(V_pf_state_key_z, M_NOWAIT)) == NULL) return (ENOMEM); /* caller must handle cleanup */ Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Tue Mar 6 13:43:57 2012 (r232604) +++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Tue Mar 6 13:57:28 2012 (r232605) @@ -275,6 +275,7 @@ pf_state_key_ini(void *mem, int size, in { struct pf_state_key *sk = mem; + bzero(sk, sizeof(*sk)); TAILQ_INIT(&sk->states); return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203061357.q26DvSlB043091>