diff mbox

[net,1/1] via-rhine: fix VLAN receive handling regression.

Message ID 20151014221437.GA8065@electric-eye.fr.zoreil.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Francois Romieu Oct. 14, 2015, 10:14 p.m. UTC 
From: Andrej Ota <andrej@ota.si>

Because eth_type_trans() consumes ethernet header worth of bytes, a call
to read TCI from end of packet using rhine_rx_vlan_tag() no longer works
as it's reading from an invalid offset.

Tested to be working on PCEngines Alix board.

Fixes: 810f19bcb862 ("via-rhine: add consistent memory barrier in vlan receive code.")
Signed-off-by: Andrej Ota <andrej@ota.si>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>

---

 Applies fine as of 0f8b8e28fb3241f9fd82ce13bac2b40c35e987e0
 ("tipc: eliminate risk of stalled link synchronization").

 Andrej posted it on l-k the 2015/10/04, see
 http://marc.info/?l=linux-kernel&m=144398918324349

 Kernel v4.2 exhibits the regression. Stable v4.[01] kernels don't.

 drivers/net/ethernet/via/via-rhine.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Nix Oct. 15, 2015, 7:24 a.m. UTC | #1 
On 14 Oct 2015, Francois Romieu told this:

> From: Andrej Ota <andrej@ota.si>
>
> Because eth_type_trans() consumes ethernet header worth of bytes, a call
> to read TCI from end of packet using rhine_rx_vlan_tag() no longer works
> as it's reading from an invalid offset.
>
> Tested to be working on PCEngines Alix board.

LGTM, though not tested because I don't have any vlans set up on my VIA
Rhine box and I can't reboot it at the moment. :)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller Oct. 16, 2015, 8:02 a.m. UTC | #2 
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Thu, 15 Oct 2015 00:14:37 +0200

> From: Andrej Ota <andrej@ota.si>
> 
> Because eth_type_trans() consumes ethernet header worth of bytes, a call
> to read TCI from end of packet using rhine_rx_vlan_tag() no longer works
> as it's reading from an invalid offset.
> 
> Tested to be working on PCEngines Alix board.
> 
> Fixes: 810f19bcb862 ("via-rhine: add consistent memory barrier in vlan receive code.")
> Signed-off-by: Andrej Ota <andrej@ota.si>
> Acked-by: Francois Romieu <romieu@fr.zoreil.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index a832637..2b7550c 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -2134,10 +2134,11 @@  static int rhine_rx(struct net_device *dev, int limit)
 			}
 
 			skb_put(skb, pkt_len);
-			skb->protocol = eth_type_trans(skb, dev);
 
 			rhine_rx_vlan_tag(skb, desc, data_size);
 
+			skb->protocol = eth_type_trans(skb, dev);
+
 			netif_receive_skb(skb);
 
 			u64_stats_update_begin(&rp->rx_stats.syncp);