Miaohe Lin faec5d251c net: Fix potential wrong skb->protocol in skb_vlan_untag() ...

[ Upstream commit 55eff0eb74 ]

We may access the two bytes after vlan_hdr in vlan_set_encap_proto(). So
we should pull VLAN_HLEN + sizeof(unsigned short) in skb_vlan_untag() or
we may access the wrong data.

Fixes: 0d5501c1c8 ("net: Always untag vlan-tagged traffic on input.")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2023-05-16 08:56:25 +09:00

..

datagram.c

net: add READ_ONCE() annotation in __skb_wait_for_more_packets()

2023-05-15 14:57:15 +09:00

dev_addr_lists.c

net: fix uninit-value in __hw_addr_add_ex()

2018-05-16 10:08:41 +02:00

dev_ioctl.c

net: Zero terminate ifr_name in dev_ifname().

2017-08-11 08:49:32 -07:00

dev.c

dev: Defer free of skbs in flush_backlog

2023-05-16 08:38:53 +09:00

devlink.c

devlink: add hardware messages tracing facility

2016-07-12 14:20:18 -07:00

drop_monitor.c

drop_monitor: work around gcc-10 stringop-overflow warning

2023-05-15 17:27:30 +09:00

dst_cache.c

net: dst_cache_per_cpu_dst_set() can be static

2016-03-18 17:45:08 -04:00

dst.c

Fix an intermittent pr_emerg warning about lo becoming free.

2017-07-05 14:40:14 +02:00

ethtool.c

net: ethtool: Add back transceiver type

2023-05-15 16:47:23 +09:00

fib_rules.c

net: fib_rules: Correctly set table field when table number exceeds 8 bits

2023-05-15 17:01:30 +09:00

filter.c

Merge 4.9.79 into android-4.9

2018-01-31 14:13:00 +01:00

flow_dissector.c

net/flow_dissector: switch to siphash

2023-05-15 14:57:24 +09:00

flow.c

flowcache: Increase threshold for refusing new allocations

2016-11-23 06:37:09 +01:00

gen_estimator.c

net: sched: do not acquire qdisc spinlock in qdisc/class stats dump

2016-06-07 16:37:14 -07:00

gen_stats.c

gen_stats: Fix netlink stats dumping in the presence of padding

2023-05-12 16:36:56 +09:00

hwbm.c

net: hwbm: Fix unbalanced spinlock in error case

2016-05-25 12:35:09 -07:00

link_watch.c

dev: introduce dev_get_iflink()

2015-04-02 14:04:59 -04:00

lwtunnel.c

lwtunnel: Fix oops on state free after encap module unload

2017-02-04 09:47:11 +01:00

Makefile

net: add a hardware buffer management helper API

2016-03-14 12:19:46 -04:00

neighbour.c

net: neigh: use long type to store jiffies delta

2023-05-15 16:47:14 +09:00

net_namespace.c

net/net_namespace: Check the return value of register_pernet_subsys()

2023-05-15 16:07:34 +09:00

net-procfs.c

net: remove NETDEV_TX_LOCKED support

2016-04-26 15:53:05 -04:00

net-sysfs.c

net-sysfs: add a newline when printing 'tx_timeout' by sysfs

2023-05-16 08:38:54 +09:00

net-sysfs.h

net: netdev_kobject_init: annotate with __init

2014-01-05 20:27:54 -05:00

net-traces.c

net: IPv6 fib lookup tracepoint

2015-11-22 11:54:10 -05:00

netclassid_cgroup.c

cgroup, netclassid: periodically release file_lock on classid updating

2023-05-15 17:08:53 +09:00

netevent.c

netevent: remove automatic variable in register_netevent_notifier()

2015-05-31 00:03:21 -07:00

netpoll.c

net: fix skb use after free in netpoll

2023-05-15 14:28:47 +09:00

netprio_cgroup.c

netprio_cgroup: Fix unlimited memory leak of v2 cgroups

2023-05-15 17:28:00 +09:00

pktgen.c

pktgen: do not sleep with the thread lock held.

2023-05-15 13:40:50 +09:00

ptp_classifier.c

ptp: Change ptp_class to a proper bitmask

2015-11-03 11:08:22 -05:00

request_sock.c

tcp: restore fastopen operations

2015-10-05 03:19:06 -07:00

rtnetlink.c

net: rtnl_configure_link: fix dev flags changes arg to __dev_notify_flags

2023-05-15 17:30:44 +09:00

scm.c

unix: correctly track in-flight fds in sending process user_struct

2016-02-08 10:30:42 -05:00

secure_seq.c

net: remove a sparse error in secure_dccpv6_sequence_number()

2015-05-25 22:55:37 -04:00

skbuff.c

net: Fix potential wrong skb->protocol in skb_vlan_untag()

2023-05-16 08:56:25 +09:00

sock_diag.c

Merge 4.9.77 into android-4.9

2018-01-17 10:29:45 +01:00

sock_reuseport.c

soreuseport: fix mem leak in reuseport_add_sock()

2018-02-13 12:35:57 +01:00

sock.c

net/compat: Add missing sock updates for SCM_RIGHTS

2023-05-16 08:47:54 +09:00

stream.c

tcp: make sure EPOLLOUT wont be missed

2023-05-15 14:21:48 +09:00

sysctl_net_core.c

net, sysctl: Fix compiler warning when only cBPF is present

2023-05-15 16:21:32 +09:00

timestamping.c

net: skb_defer_rx_timestamp should check for phydev before setting up classify

2015-07-09 14:17:15 -07:00

tso.c

net: tso: add support for IPv6

2015-10-26 22:24:22 -07:00

utils.c

net: Fix skb->csum update in inet_proto_csum_replace16().

2023-05-15 16:55:05 +09:00