Hannes Frederic Sowa
eeddd9177a
ipv6: call udp_push_pending_frames when uncorking a socket with AF_INET pending data
[ Upstream commit 8822b64a0f ]
We accidentally call down to ip6_push_pending_frames when uncorking
pending AF_INET data on a ipv6 socket. This results in the following
splat (from Dave Jones):
skbuff: skb_under_panic: text:ffffffff816765f6 len:48 put:40 head:ffff88013deb6df0 data:ffff88013deb6dec tail:0x2c end:0xc0 dev:<NULL>
------------[ cut here ]------------
kernel BUG at net/core/skbuff.c:126!
invalid opcode: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
Modules linked in: dccp_ipv4 dccp 8021q garp bridge stp dlci mpoa snd_seq_dummy sctp fuse hidp tun bnep nfnetlink scsi_transport_iscsi rfcomm can_raw can_bcm af_802154 appletalk caif_socket can caif ipt_ULOG x25 rose af_key pppoe pppox ipx phonet irda llc2 ppp_generic slhc p8023 psnap p8022 llc crc_ccitt atm bluetooth
+netrom ax25 nfc rfkill rds af_rxrpc coretemp hwmon kvm_intel kvm crc32c_intel snd_hda_codec_realtek ghash_clmulni_intel microcode pcspkr snd_hda_codec_hdmi snd_hda_intel snd_hda_codec snd_hwdep usb_debug snd_seq snd_seq_device snd_pcm e1000e snd_page_alloc snd_timer ptp snd pps_core soundcore xfs libcrc32c
CPU: 2 PID: 8095 Comm: trinity-child2 Not tainted 3.10.0-rc7+ #37
task: ffff8801f52c2520 ti: ffff8801e6430000 task.ti: ffff8801e6430000
RIP: 0010:[<ffffffff816e759c>] [<ffffffff816e759c>] skb_panic+0x63/0x65
RSP: 0018:ffff8801e6431de8 EFLAGS: 00010282
RAX: 0000000000000086 RBX: ffff8802353d3cc0 RCX: 0000000000000006
RDX: 0000000000003b90 RSI: ffff8801f52c2ca0 RDI: ffff8801f52c2520
RBP: ffff8801e6431e08 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000001 R11: 0000000000000001 R12: ffff88022ea0c800
R13: ffff88022ea0cdf8 R14: ffff8802353ecb40 R15: ffffffff81cc7800
FS: 00007f5720a10740(0000) GS:ffff880244c00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000005862000 CR3: 000000022843c000 CR4: 00000000001407e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000600
Stack:
ffff88013deb6dec 000000000000002c 00000000000000c0 ffffffff81a3f6e4
ffff8801e6431e18 ffffffff8159a9aa ffff8801e6431e90 ffffffff816765f6
ffffffff810b756b 0000000700000002 ffff8801e6431e40 0000fea9292aa8c0
Call Trace:
[<ffffffff8159a9aa>] skb_push+0x3a/0x40
[<ffffffff816765f6>] ip6_push_pending_frames+0x1f6/0x4d0
[<ffffffff810b756b>] ? mark_held_locks+0xbb/0x140
[<ffffffff81694919>] udp_v6_push_pending_frames+0x2b9/0x3d0
[<ffffffff81694660>] ? udplite_getfrag+0x20/0x20
[<ffffffff8162092a>] udp_lib_setsockopt+0x1aa/0x1f0
[<ffffffff811cc5e7>] ? fget_light+0x387/0x4f0
[<ffffffff816958a4>] udpv6_setsockopt+0x34/0x40
[<ffffffff815949f4>] sock_common_setsockopt+0x14/0x20
[<ffffffff81593c31>] SyS_setsockopt+0x71/0xd0
[<ffffffff816f5d54>] tracesys+0xdd/0xe2
Code: 00 00 48 89 44 24 10 8b 87 d8 00 00 00 48 89 44 24 08 48 8b 87 e8 00 00 00 48 c7 c7 c0 04 aa 81 48 89 04 24 31 c0 e8 e1 7e ff ff <0f> 0b 55 48 89 e5 0f 0b 55 48 89 e5 0f 0b 55 48 89 e5 0f 0b 55
RIP [<ffffffff816e759c>] skb_panic+0x63/0x65
RSP <ffff8801e6431de8>
This patch adds a check if the pending data is of address family AF_INET
and directly calls udp_push_ending_frames from udp_v6_push_pending_frames
if that is the case.
This bug was found by Dave Jones with trinity.
(Also move the initialization of fl6 below the AF_INET check, even if
not strictly necessary.)
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Cc: Dave Jones <davej@redhat.com>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-28 16:26:02 -07:00
..
2012-01-05 10:51:44 -06:00
2013-06-20 11:58:44 -07:00
2012-02-04 16:06:28 -05:00
2012-03-07 22:52:24 -08:00
2012-10-21 09:28:00 -07:00
2012-03-04 17:54:34 -05:00
2012-03-06 15:16:25 -05:00
2012-05-10 23:15:47 -04:00
2013-07-28 16:26:02 -07:00
2012-03-20 21:29:41 -04:00
2012-02-15 17:48:35 -05:00
2011-11-30 18:51:03 -05:00
2012-11-17 13:16:11 -08:00
2012-07-16 09:03:44 -07:00
2012-03-11 19:11:22 -07:00
2012-03-02 18:16:49 -08:00
2012-02-15 16:37:44 -05:00
2011-12-01 11:41:06 -05:00
2012-06-10 00:36:15 +09:00
2011-11-29 13:17:03 -05:00
2012-02-04 19:29:48 -05:00
2012-01-30 15:22:06 -05:00
2013-02-28 06:59:06 -08:00
2013-01-11 09:07:14 -08:00
2013-03-28 12:11:54 -07:00
2013-02-28 06:59:06 -08:00
2011-12-14 13:34:55 -05:00
2012-07-16 09:03:45 -07:00
2012-04-17 22:31:59 -04:00
2011-12-25 02:21:45 -05:00
2013-03-28 12:11:53 -07:00
2012-10-21 09:28:00 -07:00
2012-03-09 14:34:50 -08:00
2013-02-28 06:59:06 -08:00
2012-04-09 15:54:48 -04:00
2012-01-27 21:00:08 -05:00
2011-12-28 15:06:58 -05:00
2011-12-11 18:25:16 -05:00
2012-01-30 15:22:06 -05:00
2012-02-10 15:08:57 -05:00
2011-12-11 18:25:16 -05:00
2012-04-16 23:53:11 -04:00
2012-02-04 19:29:48 -05:00
2012-02-21 16:56:45 -05:00
2012-07-16 09:03:47 -07:00
2013-05-01 09:41:16 -07:00
2012-01-09 13:08:28 -08:00
2013-05-19 10:54:47 -07:00
2012-02-02 09:20:22 -08:00
2013-05-19 10:54:43 -07:00
2012-03-04 17:54:34 -05:00
2013-07-28 16:26:02 -07:00
2012-03-12 17:05:21 -07:00
2012-03-04 17:54:34 -05:00
2012-10-13 05:38:40 +09:00