netdev - Re: [PATCH v2.6.33 2/2] jme: Adding lock to protect vlgrp structure.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <97949e3e1003151122q68ce19f4ja7f53ad380d3033f@mail.gmail.com>
Date:	Mon, 15 Mar 2010 11:22:48 -0700
From:	Laurent Chavey <chavey@...gle.com>
To:	cooldavid@...ldavid.org
Cc:	David Miller <davem@...emloft.net>,
	linux-netdev <netdev@...r.kernel.org>,
	Ethan Hsiao <ethanhsiao@...cron.com>
Subject: Re: [PATCH v2.6.33 2/2] jme: Adding lock to protect vlgrp structure.

what does the spinlock protect ?


On Sun, Mar 14, 2010 at 10:15 PM,  <cooldavid@...ldavid.org> wrote:
> From: Guo-Fu Tseng <cooldavid@...ldavid.org>
>
> Adding a lock to prevent modifying the vlgrp structure while receiving
> VLAN packet.
>
> Signed-off-by: Guo-Fu Tseng <cooldavid@...ldavid.org>
> ---
>  drivers/net/jme.c |    6 ++++++
>  drivers/net/jme.h |    1 +
>  2 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/jme.c b/drivers/net/jme.c
> index 3da390a..f10d9db 100644
> --- a/drivers/net/jme.c
> +++ b/drivers/net/jme.c
> @@ -942,11 +942,14 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
>                        skb->ip_summed = CHECKSUM_NONE;
>
>                if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {
> +                       spin_lock(&jme->vlgrp_lock);
>                        if (jme->vlgrp) {
>                                jme->jme_vlan_rx(skb, jme->vlgrp,
>                                        le16_to_cpu(rxdesc->descwb.vlan));
> +                               spin_unlock(&jme->vlgrp_lock);
>                                NET_STAT(jme).rx_bytes += 4;
>                        } else {
> +                               spin_unlock(&jme->vlgrp_lock);
>                                dev_kfree_skb(skb);
>                        }
>                } else {
> @@ -2092,7 +2095,9 @@ jme_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
>  {
>        struct jme_adapter *jme = netdev_priv(netdev);
>
> +       spin_lock_bh(&jme->vlgrp_lock);
>        jme->vlgrp = grp;
> +       spin_unlock_bh(&jme->vlgrp_lock);
>  }
>
>  static void
> @@ -2759,6 +2764,7 @@ jme_init_one(struct pci_dev *pdev,
>        spin_lock_init(&jme->phy_lock);
>        spin_lock_init(&jme->macaddr_lock);
>        spin_lock_init(&jme->rxmcs_lock);
> +       spin_lock_init(&jme->vlgrp_lock);
>
>        atomic_set(&jme->link_changing, 1);
>        atomic_set(&jme->rx_cleaning, 1);
> diff --git a/drivers/net/jme.h b/drivers/net/jme.h
> index 251abed..fbde5c5 100644
> --- a/drivers/net/jme.h
> +++ b/drivers/net/jme.h
> @@ -420,6 +420,7 @@ struct jme_adapter {
>        spinlock_t              phy_lock;
>        spinlock_t              macaddr_lock;
>        spinlock_t              rxmcs_lock;
> +       spinlock_t              vlgrp_lock;
>        struct tasklet_struct   rxempty_task;
>        struct tasklet_struct   rxclean_task;
>        struct tasklet_struct   txclean_task;
> --
> 1.6.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html