Files
linux/include/linux
Cong Wang da8c87241c vlan: adjust vlan_set_encap_proto() for its callers
There are two places to call vlan_set_encap_proto():
vlan_untag() and __pop_vlan_tci().

vlan_untag() assumes skb->data points after mac addr, otherwise
the following code

        vhdr = (struct vlan_hdr *) skb->data;
        vlan_tci = ntohs(vhdr->h_vlan_TCI);
        __vlan_hwaccel_put_tag(skb, vlan_tci);

        skb_pull_rcsum(skb, VLAN_HLEN);

won't be correct. But __pop_vlan_tci() assumes points _before_
mac addr.

In vlan_set_encap_proto(), it looks for some magic L2 value
after mac addr:

        rawp = skb->data;
        if (*(unsigned short *) rawp == 0xFFFF)
	...

Therefore __pop_vlan_tci() is obviously wrong.

A quick fix is avoiding using skb->data in vlan_set_encap_proto(),
use 'vhdr+1' is always correct in both cases.

Cc: David S. Miller <davem@davemloft.net>
Cc: Jesse Gross <jesse@nicira.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-23 21:00:06 -05:00
..
2013-01-02 17:36:10 -08:00
2013-01-02 17:36:10 -08:00
2012-11-30 12:37:36 +01:00
2013-01-03 14:34:06 -08:00
2012-07-30 17:25:21 -07:00
2012-10-08 13:50:20 +10:30
2012-12-02 00:05:12 +00:00
2012-09-19 19:08:46 -06:00
2012-09-20 14:31:45 +02:00
2012-07-30 17:25:11 -07:00
2012-03-23 16:58:38 -07:00
2012-12-20 13:57:36 -05:00
2012-12-21 20:23:41 +00:00
2012-02-20 19:46:36 +11:00
2012-11-08 16:58:31 +01:00
2012-09-30 18:02:20 -07:00
2012-11-28 11:54:40 +01:00
2012-10-16 18:49:15 -07:00
2012-11-22 13:43:27 +09:00
2012-11-28 21:49:02 -05:00
2012-11-28 21:49:02 -05:00
2012-11-08 16:58:30 +01:00
2012-04-27 10:46:45 +08:00
2012-11-21 10:07:48 +01:00
2013-01-25 21:03:54 -08:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-11-23 12:23:40 +01:00
2013-02-06 15:59:47 -05:00
2012-12-14 13:05:26 +10:30
2013-01-29 13:59:57 -05:00
2012-09-07 14:57:45 -04:00
2012-03-20 12:47:48 +01:00
2012-09-11 10:15:02 +02:00
2012-03-20 12:47:47 +01:00
2012-11-21 15:09:26 -08:00
2012-07-17 09:13:37 -07:00
2012-05-31 17:49:32 -07:00
2012-09-26 13:52:36 -07:00
2012-11-20 16:15:02 +10:00
2012-11-03 14:50:15 -04:00
2012-10-10 01:15:44 -04:00
2012-03-15 21:41:34 +01:00
2012-12-12 17:38:33 -08:00
2012-12-14 13:06:40 +10:30
2012-12-25 18:45:06 -05:00
2012-12-11 17:22:27 -08:00
2012-10-17 15:53:02 -05:00
2012-10-10 22:41:05 -04:00
2012-07-10 10:32:06 -05:00
2012-05-21 14:31:48 +01:00
2012-07-31 18:42:43 -07:00
2012-06-20 14:39:36 -07:00
2012-11-18 01:01:49 +01:00
2013-01-24 15:37:26 +01:00
2013-01-03 15:57:14 -08:00
2012-03-20 21:29:38 -04:00
2013-01-23 13:44:00 -05:00
2012-11-16 14:33:04 -08:00
2012-10-06 03:05:01 +09:00
2012-09-27 12:45:28 +02:00
2012-12-18 15:02:13 -08:00
2012-12-18 15:02:14 -08:00
2012-06-05 17:32:30 +02:00
2013-02-10 19:41:08 -05:00
2012-06-13 21:16:42 +02:00
2012-10-09 16:22:55 +09:00
2012-08-21 16:28:31 +02:00
2012-10-09 16:22:32 +09:00
2012-07-22 23:57:55 +04:00
2012-10-22 16:58:28 -07:00
2012-11-15 17:20:58 -08:00
2013-02-08 18:28:04 +01:00
2012-09-05 17:21:36 -07:00
2013-01-25 15:06:01 -08:00