netdev - Re: [patch net-next-2.6] forcedeth: fix vlans

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]

Date:	Tue, 26 Jul 2011 19:45:19 +0200
From:	Michał Mirosław <mirqus@...il.com>
To:	Jiri Pirko <jpirko@...hat.com>
Cc:	netdev@...r.kernel.org, davem@...emloft.net, johnstul@...ibm.com,
	w41ter@...il.com
Subject: Re: [patch net-next-2.6] forcedeth: fix vlans

2011/7/26 Jiri Pirko <jpirko@...hat.com>:
> For some reason, when rxaccel is disabled, NV_RX3_VLAN_TAG_PRESENT is
> still set and some pseudorandom vids appear. So check for
> NETIF_F_HW_VLAN_RX as well. Also set correctly hw_features and set vlan
> mode on probe.
>
> Signed-off-by: Jiri Pirko <jpirko@...hat.com>
> ---
>  drivers/net/forcedeth.c |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
> index e64cd9c..256a272 100644
> --- a/drivers/net/forcedeth.c
> +++ b/drivers/net/forcedeth.c
> @@ -2764,7 +2764,8 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit)
>                        prefetch(skb->data);
>
>                        vlanflags = le32_to_cpu(np->get_rx.ex->buflow);
> -                       if (vlanflags & NV_RX3_VLAN_TAG_PRESENT) {
> +                       if (dev->features & NETIF_F_HW_VLAN_RX &&
> +                           vlanflags & NV_RX3_VLAN_TAG_PRESENT) {
>                                u16 vid = vlanflags & NV_RX3_VLAN_TAG_MASK;

Please add comment that resembles this patch's description. This is a
bad idea to do in the general case as this will cause VLAN tagged
packets that were in the queue before feature change to be
misinterpreted.

>
>                                __vlan_hwaccel_put_tag(skb, vid);
> @@ -5337,7 +5338,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
>        np->vlanctl_bits = 0;
>        if (id->driver_data & DEV_HAS_VLAN) {
>                np->vlanctl_bits = NVREG_VLANCONTROL_ENABLE;
> -               dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
> +               dev->hw_features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
> +               dev->features |= dev->hw_features;
>        }

For better readability, hw_features -> features copy should be done
only once in this function.

Best Regards,
Michał Mirosław
--
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