xnu-4570.1.46.tar.gz

[apple/xnu.git] / bsd / net / kpi_protocol.c

diff --git a/bsd/net/kpi_protocol.c b/bsd/net/kpi_protocol.c
index 170dd25f058a381e31b88e00522d5c3e5451d473..c6314269d24b257b5de835cd62a0c258e57fcaab 100644 (file)
--- a/bsd/net/kpi_protocol.c
+++ b/bsd/net/kpi_protocol.c
@@ -107,11 +107,10 @@ proto_register_input(protocol_family_t protocol, proto_input_handler input,
        struct domain *dp;
        domain_guard_t guard;
 
-       entry = _MALLOC(sizeof (*entry), M_IFADDR, M_WAITOK);
+       entry = _MALLOC(sizeof (*entry), M_IFADDR, M_WAITOK | M_ZERO);
        if (entry == NULL)
                return (ENOMEM);
 
-       bzero(entry, sizeof (*entry));
        entry->protocol = protocol;
        entry->input = input;
        entry->detached = detached;
@@ -194,7 +193,7 @@ proto_input_run(void)
        mbuf_t packet_list;
        int i, locked = 0;
 
-       lck_mtx_assert(&inp->input_lck, LCK_MTX_ASSERT_NOTOWNED);
+       LCK_MTX_ASSERT(&inp->input_lck, LCK_MTX_ASSERT_NOTOWNED);
 
        if (inp->input_waiting & DLIL_PROTO_REGISTER) {
                lck_mtx_lock_spin(&inp->input_lck);
@@ -365,13 +364,13 @@ proto_register_plumber(protocol_family_t protocol_family,
        }
 
        proto_family = (struct proto_family_str *)
-           _MALLOC(sizeof (struct proto_family_str), M_IFADDR, M_WAITOK);
+           _MALLOC(sizeof (struct proto_family_str), M_IFADDR,
+           M_WAITOK | M_ZERO);
        if (!proto_family) {
                lck_mtx_unlock(proto_family_mutex);
                return (ENOMEM);
        }
 
-       bzero(proto_family, sizeof (struct proto_family_str));
        proto_family->proto_family      = protocol_family;
        proto_family->if_family         = interface_family & 0xffff;
        proto_family->attach_proto      = attach;