Bernd Eckstein f61ebb6bd7 usbnet: ipheth: fix potential recvmsg bug and recvmsg bug 2 ... [ Upstream commit 45611c61dd ] The bug is not easily reproducable, as it may occur very infrequently (we had machines with 20minutes heavy downloading before it occurred) However, on a virual machine (VMWare on Windows 10 host) it occurred pretty frequently (1-2 seconds after a speedtest was started) dev->tx_skb mab be freed via dev_kfree_skb_irq on a callback before it is set. This causes the following problems: - double free of the skb or potential memory leak - in dmesg: 'recvmsg bug' and 'recvmsg bug 2' and eventually general protection fault Example dmesg output: [ 134.841986] ------------[ cut here ]------------ [ 134.841987] recvmsg bug: copied 9C24A555 seq 9C24B557 rcvnxt 9C25A6B3 fl 0 [ 134.841993] WARNING: CPU: 7 PID: 2629 at /build/linux-hwe-On9fm7/linux-hwe-4.15.0/net/ipv4/tcp.c:1865 tcp_recvmsg+0x44d/0xab0 [ 134.841994] Modules linked in: ipheth(OE) kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc aesni_intel aes_x86_64 crypto_simd glue_helper cryptd vmw_balloon intel_rapl_perf joydev input_leds serio_raw vmw_vsock_vmci_transport vsock shpchp i2c_piix4 mac_hid binfmt_misc vmw_vmci parport_pc ppdev lp parport autofs4 vmw_pvscsi vmxnet3 hid_generic usbhid hid vmwgfx ttm drm_kms_helper syscopyarea sysfillrect mptspi mptscsih sysimgblt ahci psmouse fb_sys_fops pata_acpi mptbase libahci e1000 drm scsi_transport_spi [ 134.842046] CPU: 7 PID: 2629 Comm: python Tainted: G W OE 4.15.0-34-generic #37~16.04.1-Ubuntu [ 134.842046] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 05/19/2017 [ 134.842048] RIP: 0010:tcp_recvmsg+0x44d/0xab0 [ 134.842048] RSP: 0018:ffffa6630422bcc8 EFLAGS: 00010286 [ 134.842049] RAX: 0000000000000000 RBX: ffff997616f4f200 RCX: 0000000000000006 [ 134.842049] RDX: 0000000000000007 RSI: 0000000000000082 RDI: ffff9976257d6490 [ 134.842050] RBP: ffffa6630422bd98 R08: 0000000000000001 R09: 000000000004bba4 [ 134.842050] R10: 0000000001e00c6f R11: 000000000004bba4 R12: ffff99760dee3000 [ 134.842051] R13: 0000000000000000 R14: ffff99760dee3514 R15: 0000000000000000 [ 134.842051] FS: 00007fe332347700(0000) GS:ffff9976257c0000(0000) knlGS:0000000000000000 [ 134.842052] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 134.842053] CR2: 0000000001e41000 CR3: 000000020e9b4006 CR4: 00000000003606e0 [ 134.842055] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 134.842055] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 134.842057] Call Trace: [ 134.842060] ? aa_sk_perm+0x53/0x1a0 [ 134.842064] inet_recvmsg+0x51/0xc0 [ 134.842066] sock_recvmsg+0x43/0x50 [ 134.842070] SYSC_recvfrom+0xe4/0x160 [ 134.842072] ? __schedule+0x3de/0x8b0 [ 134.842075] ? ktime_get_ts64+0x4c/0xf0 [ 134.842079] SyS_recvfrom+0xe/0x10 [ 134.842082] do_syscall_64+0x73/0x130 [ 134.842086] entry_SYSCALL_64_after_hwframe+0x3d/0xa2 [ 134.842086] RIP: 0033:0x7fe331f5a81d [ 134.842088] RSP: 002b:00007ffe8da98398 EFLAGS: 00000246 ORIG_RAX: 000000000000002d [ 134.842090] RAX: ffffffffffffffda RBX: ffffffffffffffff RCX: 00007fe331f5a81d [ 134.842094] RDX: 00000000000003fb RSI: 0000000001e00874 RDI: 0000000000000003 [ 134.842095] RBP: 00007fe32f642c70 R08: 0000000000000000 R09: 0000000000000000 [ 134.842097] R10: 0000000000000000 R11: 0000000000000246 R12: 00007fe332347698 [ 134.842099] R13: 0000000001b7e0a0 R14: 0000000001e00874 R15: 0000000000000000 [ 134.842103] Code: 24 fd ff ff e9 cc fe ff ff 48 89 d8 41 8b 8c 24 10 05 00 00 44 8b 45 80 48 c7 c7 08 bd 59 8b 48 89 85 68 ff ff ff e8 b3 c4 7d ff <0f> 0b 48 8b 85 68 ff ff ff e9 e9 fe ff ff 41 8b 8c 24 10 05 00 [ 134.842126] ---[ end trace b7138fc08c83147f ]--- [ 134.842144] general protection fault: 0000 [#1] SMP PTI [ 134.842145] Modules linked in: ipheth(OE) kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc aesni_intel aes_x86_64 crypto_simd glue_helper cryptd vmw_balloon intel_rapl_perf joydev input_leds serio_raw vmw_vsock_vmci_transport vsock shpchp i2c_piix4 mac_hid binfmt_misc vmw_vmci parport_pc ppdev lp parport autofs4 vmw_pvscsi vmxnet3 hid_generic usbhid hid vmwgfx ttm drm_kms_helper syscopyarea sysfillrect mptspi mptscsih sysimgblt ahci psmouse fb_sys_fops pata_acpi mptbase libahci e1000 drm scsi_transport_spi [ 134.842161] CPU: 7 PID: 2629 Comm: python Tainted: G W OE 4.15.0-34-generic #37~16.04.1-Ubuntu [ 134.842162] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 05/19/2017 [ 134.842164] RIP: 0010:tcp_close+0x2c6/0x440 [ 134.842165] RSP: 0018:ffffa6630422bde8 EFLAGS: 00010202 [ 134.842167] RAX: 0000000000000000 RBX: ffff99760dee3000 RCX: 0000000180400034 [ 134.842168] RDX: 5c4afd407207a6c4 RSI: ffffe868495bd300 RDI: ffff997616f4f200 [ 134.842169] RBP: ffffa6630422be08 R08: 0000000016f4d401 R09: 0000000180400034 [ 134.842169] R10: ffffa6630422bd98 R11: 0000000000000000 R12: 000000000000600c [ 134.842170] R13: 0000000000000000 R14: ffff99760dee30c8 R15: ffff9975bd44fe00 [ 134.842171] FS: 00007fe332347700(0000) GS:ffff9976257c0000(0000) knlGS:0000000000000000 [ 134.842173] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 134.842174] CR2: 0000000001e41000 CR3: 000000020e9b4006 CR4: 00000000003606e0 [ 134.842177] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 134.842178] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 134.842179] Call Trace: [ 134.842181] inet_release+0x42/0x70 [ 134.842183] __sock_release+0x42/0xb0 [ 134.842184] sock_close+0x15/0x20 [ 134.842187] __fput+0xea/0x220 [ 134.842189] ____fput+0xe/0x10 [ 134.842191] task_work_run+0x8a/0xb0 [ 134.842193] exit_to_usermode_loop+0xc4/0xd0 [ 134.842195] do_syscall_64+0xf4/0x130 [ 134.842197] entry_SYSCALL_64_after_hwframe+0x3d/0xa2 [ 134.842197] RIP: 0033:0x7fe331f5a560 [ 134.842198] RSP: 002b:00007ffe8da982e8 EFLAGS: 00000246 ORIG_RAX: 0000000000000003 [ 134.842200] RAX: 0000000000000000 RBX: 00007fe32f642c70 RCX: 00007fe331f5a560 [ 134.842201] RDX: 00000000008f5320 RSI: 0000000001cd4b50 RDI: 0000000000000003 [ 134.842202] RBP: 00007fe32f6500f8 R08: 000000000000003c R09: 00000000009343c0 [ 134.842203] R10: 0000000000000000 R11: 0000000000000246 R12: 00007fe32f6500d0 [ 134.842204] R13: 00000000008f5320 R14: 00000000008f5320 R15: 0000000001cd4770 [ 134.842205] Code: c8 00 00 00 45 31 e4 49 39 fe 75 4d eb 50 83 ab d8 00 00 00 01 48 8b 17 48 8b 47 08 48 c7 07 00 00 00 00 48 c7 47 08 00 00 00 00 <48> 89 42 08 48 89 10 0f b6 57 34 8b 47 2c 2b 47 28 83 e2 01 80 [ 134.842226] RIP: tcp_close+0x2c6/0x440 RSP: ffffa6630422bde8 [ 134.842227] ---[ end trace b7138fc08c831480 ]--- The proposed patch eliminates a potential racing condition. Before, usb_submit_urb was called and _after_ that, the skb was attached (dev->tx_skb). So, on a callback it was possible, however unlikely that the skb was freed before it was set. That way (because dev->tx_skb was not set to NULL after it was freed), it could happen that a skb from a earlier transmission was freed a second time (and the skb we should have freed did not get freed at all) Now we free the skb directly in ipheth_tx(). It is not passed to the callback anymore, eliminating the posibility of a double free of the same skb. Depending on the retval of usb_submit_urb() we use dev_kfree_skb_any() respectively dev_consume_skb_any() to free the skb. Signed-off-by: Oliver Zweigle <Oliver.Zweigle@faro.com> Signed-off-by: Bernd Eckstein <3ernd.Eckstein@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2018-12-13 09:21:26 +01:00
..
appletalk	net/appletalk: fix minor pointer leak to userspace in SIOCFINDIPDDPRT	2018-09-29 03:08:52 -07:00
arcnet	arcnet/com20020: add LEDS_CLASS dependency	2015-11-03 11:29:56 -05:00
bonding	bonding: avoid defaulting hard_header_len to ETH_HLEN on slave removal	2018-11-10 07:41:40 -08:00
caif	net: caif: check return value of alloc_netdev	2015-11-09 11:31:13 -05:00
can	can: dev: __can_get_echo_skb(): print error message, if trying to echo non existing skb	2018-12-01 09:46:34 +01:00
cris
dsa	net: dsa: bcm_sf2: Ensure we re-negotiate EEE during after link change	2016-12-10 19:07:23 +01:00
ethernet	net: bcmgenet: fix OF child-node lookup	2018-12-01 09:46:36 +01:00
fddi	net/fddi: remove HWM_REVERSE() macro	2015-08-13 21:12:17 -07:00
fjes	fjes: Fix wrong netdevice feature flags	2017-12-20 10:04:55 +01:00
hamradio	net: hamradio: use eth_broadcast_addr	2018-08-24 13:26:55 +02:00
hippi	hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close	2018-02-25 11:03:42 +01:00
hyperv	hv_netvsc: use skb_get_hash() instead of a homegrown implementation	2017-03-26 12:13:18 +02:00
ieee802154	ieee802154: fakelb: switch from BUG_ON() to WARN_ON() on problem	2018-08-24 13:26:58 +02:00
ipvlan	ipvlan: add L2 check for packets arriving via virtual devices	2018-03-22 09:23:30 +01:00
irda	irda: fix overly long udelay()	2018-06-06 16:46:21 +02:00
phy	net: phy: fix flag masking in __set_phy_supported	2018-07-25 10:18:17 +02:00
plip
ppp	pppoe: check sockaddr length in pppoe_connect()	2018-04-29 07:50:05 +02:00
slip	slip: Check if rstate is initialized before uncompressing	2018-04-24 09:32:04 +02:00
team	team: Forbid enslaving team device to itself	2018-10-20 09:52:36 +02:00
usb	usbnet: ipheth: fix potential recvmsg bug and recvmsg bug 2	2018-12-13 09:21:26 +01:00
vmxnet3	vmxnet3: ensure that adapter is in proper state during force_close	2018-04-13 19:50:04 +02:00
wan	drivers: net: lmc: fix case value for target abort error	2018-09-05 09:18:36 +02:00
wimax	net: wimax/i2400m: fix NULL-deref at probe	2017-12-20 10:04:54 +01:00
wireless	Revert "wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()"	2018-12-13 09:21:26 +01:00
xen-netback	xen/netback: set default upper limit of tx/rx queues to 8	2017-11-15 17:13:09 +01:00
dummy.c	net: dummy: add more features	2015-10-21 19:36:10 -07:00
eql.c
geneve.c	geneve: avoid use-after-free of skb->data	2016-12-10 19:07:24 +01:00
ifb.c
Kconfig	vmxnet3: prevent building with 64K pages	2018-02-25 11:03:42 +01:00
LICENSE.SRC
loopback.c	net: introduce device min_header_len	2017-02-18 16:39:27 +01:00
macvlan.c	macvlan: Only deliver one copy of the frame to the macvlan interface	2017-12-20 10:05:01 +01:00
macvtap.c	tun/tap: sanitize TUNSETSNDBUF input	2017-11-18 11:11:05 +01:00
Makefile	fjes: Introduce FUJITSU Extended Socket Network Device driver	2015-08-24 14:06:33 -07:00
mdio.c
mii.c
netconsole.c	netconsole: use per-attribute show and store methods	2015-10-13 22:17:51 -07:00
nlmon.c	net: nlmon: convert to using IFF_NO_QUEUE	2015-08-18 11:55:05 -07:00
ntb_netdev.c	NTB: Add flow control to the ntb_netdev	2015-09-07 15:17:08 -04:00
rionet.c	rapidio/rionet: do not free skb before reading its length	2018-12-13 09:21:26 +01:00
sb1000.c
Space.c
sungem_phy.c
tun.c	tun: Consistently configure generic netdev params via rtnetlink	2018-11-21 09:27:31 +01:00
veth.c	veth: set peer GSO values	2018-03-22 09:23:29 +01:00
virtio_net.c	virtio-net: Fix operstate for virtio when no VIRTIO_NET_F_STATUS	2018-05-30 07:49:11 +02:00
vrf.c	vrf: Fix use after free and double free in vrf_finish_output	2018-04-13 19:50:27 +02:00
vxlan.c	vxlan: dont migrate permanent fdb entries during learn	2018-04-13 19:50:21 +02:00
xen-netfront.c	xen/netfront: don't bug in case of too many frags	2018-09-29 03:08:51 -07:00