Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 23:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-stable/net
History
Herbert Xu f40ae91307 act_mirred: Fix bogus header when redirecting from VLAN 
When you redirect a VLAN device to any device, you end up with
crap in af_packet on the xmit path because hard_header_len is
not equal to skb->mac_len.  So the redirected packet contains
four extra bytes at the start which then gets interpreted as
part of the MAC address.

This patch fixes this by only pushing skb->mac_len.  We also
need to fix ifb because it tries to undo the pushing done by
act_mirred.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-17 13:29:28 -04:00
..
6lowpan
6lowpan: nhc: add other known rfc6282 compressions
2015-02-14 23:08:44 +01:00
9p
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-20 18:51:09 -04:00
802
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
8021q
vlan: implement ndo_get_iflink
2015-04-02 14:05:00 -04:00
appletalk
appletalk: Use eth_<foo>_addr instead of memset
2015-03-03 17:01:37 -05:00
atm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
ax25
ax25: Fix the build when CONFIG_INET is disabled
2015-03-05 13:17:39 -05:00
batman-adv
dev: introduce dev_get_iflink()
2015-04-02 14:04:59 -04:00
bluetooth
Bluetooth: Read LE remote features during connection establishment
2015-04-09 08:36:54 +03:00
bridge
netfilter: nf_tables: switch registers to 32 bit addressing
2015-04-13 17:17:29 +02:00
caif
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-20 18:51:09 -04:00
can
can: introduce new raw socket option to join the given CAN filters
2015-04-01 11:28:22 +02:00
ceph
Revert "libceph: use memalloc flags for net IO"
2015-04-07 19:08:35 +03:00
core
skbuff: Do not scrub skb mark within the same name space
2015-04-16 14:20:40 -04:00
dcb
net/dcb: Add IEEE QCN attribute
2015-03-06 21:50:02 -05:00
dccp
tcp/dccp: get rid of central timewait timer
2015-04-13 16:40:05 -04:00
decnet
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
dns_resolver
Merge commit 'v3.16' into next
2014-10-01 00:44:04 +10:00
dsa
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
ethernet
ethernet: Use eth_<foo>_addr instead of memset
2015-03-03 17:01:38 -05:00
hsr
net/hsr: Fix NULL pointer dereference and refcnt bugs when deleting a HSR interface.
2015-03-01 13:40:23 -05:00
ieee802154
ieee802154: don't export static symbol
2015-03-14 17:11:31 +01:00
ipv4
inet_diag: fix access to tcp cc information
2015-04-17 13:28:31 -04:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-04-14 18:51:19 -04:00
ipx
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
irda
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-09 23:38:02 -04:00
iucv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-02 16:16:53 -04:00
key
xfrm: simplify xfrm_address_t use
2015-03-31 13:58:35 -04:00
l2tp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
lapb
lapb: move EXPORT_SYMBOL after functions.
2014-10-24 15:51:42 -04:00
llc
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
mac802154
mac802154: cleanup concurrent check
2015-03-27 19:18:50 +01:00
mpls
mpls: In mpls_egress verify the packet length.
2015-03-12 23:05:04 -04:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-04-14 18:51:19 -04:00
netlabel
netlink: implement nla_put_in_addr and nla_put_in6_addr
2015-03-31 13:58:35 -04:00
netlink
rhashtable: provide len to obj_hashfn
2015-03-25 17:18:33 +01:00
netrom
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
nfc
nfc: Fix portid type in urelease_work
2015-04-13 16:35:16 -04:00
openvswitch
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
packet
af_packet: pass checksum validation status to the user
2015-03-23 22:01:28 -04:00
phonet
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
rds
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-14 15:44:14 -04:00
rfkill
Last round of updates for net-next:
2015-02-04 14:57:45 -08:00
rose
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
rxrpc
new helper: msg_data_left()
2015-04-11 15:53:35 -04:00
sched
act_mirred: Fix bogus header when redirecting from VLAN
2015-04-17 13:29:28 -04:00
sctp
sctp: avoid to repeatedly declare external variables
2015-03-25 11:40:16 -04:00
sunrpc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
switchdev
switchdev: fix stp update API to work with layered netdevices
2015-03-23 16:44:56 -04:00
tipc
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
unix
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
vmw_vsock
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
wimax
wimax: convert printk to pr_foo()
2014-10-07 20:28:44 -04:00
wireless
cfg80211: don't allow disabling WEXT if it's required
2015-04-08 09:19:29 +02:00
x25
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
xfrm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-14 15:44:14 -04:00
compat.c
net: switch importing msghdr from userland to {compat_,}import_iovec()
2015-04-09 00:02:26 -04:00
Kconfig
kconfig: use bool instead of boolean for type definition attributes
2015-01-07 13:08:04 +01:00
Makefile
mpls: Refactor how the mpls module is built
2015-03-04 00:26:06 -05:00
socket.c
Merge branch 'iocb' into for-next
2015-04-11 22:24:41 -04:00
sysctl_net.c
…