Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/sunxi Protect ether_multi list



details:   https://anonhg.NetBSD.org/src/rev/ffa38546114a
branches:  trunk
changeset: 451162:ffa38546114a
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed May 08 09:53:43 2019 +0000

description:
Protect ether_multi list

PR 54153

diffstat:

 sys/arch/arm/sunxi/sun4i_emac.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 611dd7970874 -r ffa38546114a sys/arch/arm/sunxi/sun4i_emac.c
--- a/sys/arch/arm/sunxi/sun4i_emac.c   Wed May 08 07:44:28 2019 +0000
+++ b/sys/arch/arm/sunxi/sun4i_emac.c   Wed May 08 09:53:43 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_emac.c,v 1.7 2019/04/22 07:51:16 msaitoh Exp $ */
+/* $NetBSD: sun4i_emac.c,v 1.8 2019/05/08 09:53:43 ozaki-r Exp $ */
 
 /*-
  * Copyright (c) 2013-2017 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: sun4i_emac.c,v 1.7 2019/04/22 07:51:16 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun4i_emac.c,v 1.8 2019/05/08 09:53:43 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -864,9 +864,11 @@
        if ((ifp->if_flags & IFF_PROMISC) == 0) {
                hash[0] = hash[1] = 0;
 
+               ETHER_LOCK(&sc->sc_ec);
                ETHER_FIRST_MULTI(step, &sc->sc_ec, enm);
                while (enm != NULL) {
                        if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
+                               ETHER_UNLOCK(&sc->sc_ec);
                                /*
                                 * We must listen to a range of multicast addresses.
                                 * For now, just accept all multicasts, rather than
@@ -889,6 +891,7 @@
                        hash[crc >> 5] |= __BIT(crc & 31);
                        ETHER_NEXT_MULTI(step, enm);
                }
+               ETHER_UNLOCK(&sc->sc_ec);
                ifp->if_flags &= ~IFF_ALLMULTI;
                rxctl |= EMAC_RX_CTL_MHF;
        }



Home | Main Index | Thread Index | Old Index