Date: Mon, 11 Dec 2006 21:42:28 GMT From: Todd Miller <millert@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 111488 for review Message-ID: <200612112142.kBBLgS0s097136@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=111488 Change 111488 by millert@millert_g5tower on 2006/12/11 21:41:42 Free the right amount of memory when we have to expand the policy array. Also fix some whitespace. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#29 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#29 (text+ko) ==== @@ -781,19 +781,22 @@ if (mac_policy_list.numloaded >= mac_policy_list.max) { /* allocate new policy list array, zero new chunk */ - tmac_policy_list_element = kalloc((sizeof(struct mac_policy_list_element) * + tmac_policy_list_element = + kalloc((sizeof(struct mac_policy_list_element) * MAC_POLICY_LIST_CHUNKSIZE) * (mac_policy_list.chunks + 1)); bzero(&tmac_policy_list_element[mac_policy_list.max], - sizeof(struct mac_policy_list_element) * MAC_POLICY_LIST_CHUNKSIZE); + sizeof(struct mac_policy_list_element) * + MAC_POLICY_LIST_CHUNKSIZE); /* copy old entries into new list */ memcpy(tmac_policy_list_element, mac_policy_list.entries, - sizeof(struct mac_policy_list_element) * MAC_POLICY_LIST_CHUNKSIZE * - mac_policy_list.chunks); + sizeof(struct mac_policy_list_element) * + MAC_POLICY_LIST_CHUNKSIZE * mac_policy_list.chunks); /* free old array */ kfree(mac_policy_list.entries, - sizeof(mac_policy_list_t) * mac_policy_busy); + sizeof(struct mac_policy_list_element) * + MAC_POLICY_LIST_CHUNKSIZE * mac_policy_list.chunks); mac_policy_list.entries = tmac_policy_list_element;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612112142.kBBLgS0s097136>