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
..
9p	9p: Reduce object size with CONFIG_NET_9P_DEBUG	2012-01-05 10:51:44 -06:00
bluetooth	Bluetooth: Fix mgmt handling of power on failures	2013-06-20 11:58:44 -07:00
caif	caif-hsi: Add RX flip buffer	2012-02-04 16:06:28 -05:00
irda
iucv	af_iucv: add shutdown for HS transport	2012-03-07 22:52:24 -08:00
netfilter	netfilter: nf_conntrack: fix racy timer handling with reliable events	2012-10-21 09:28:00 -07:00
netns	BUG: headers with BUG/BUG_ON etc. need linux/bug.h	2012-03-04 17:54:34 -05:00
nfc	NFC: NCI code identation fixes	2012-03-06 15:16:25 -05:00
phonet
sctp	sctp: check cached dst before using it	2012-05-10 23:15:47 -04:00
tc_act
act_api.h
addrconf.h	ipv6,mcast: always hold idev->lock before mca_lock	2013-07-28 16:26:02 -07:00
af_ieee802154.h
af_rxrpc.h
af_unix.h	switch unix_sock to struct path	2012-03-20 21:29:41 -04:00
ah.h
arp.h	ipv4: Eliminate spurious argument to __ipv4_neigh_lookup	2012-02-15 17:48:35 -05:00
atmclip.h	atm: clip: Use device neigh support on top of "arp_tbl".	2011-11-30 18:51:03 -05:00
ax25.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
ax88796.h
cfg80211-wext.h	cfg80211: remove unused wext handler exports	2011-08-08 14:26:29 -04:00
cfg80211.h	mac80211: verify that skb data is present	2012-11-17 13:16:11 -08:00
checksum.h
cipso_ipv4.h	cipso: handle CIPSO options correctly when NetLabel is disabled	2012-07-16 09:03:44 -07:00
cls_cgroup.h
compat.h	net: get rid of some pointless casts to sockaddr	2012-03-11 19:11:22 -07:00
datalink.h
dcbevent.h	dcb: Add stub routines for !CONFIG_DCB	2011-10-06 15:49:51 -04:00
dcbnl.h	net: dcb: getnumtcs()/setnumtcs() should return an int	2012-03-02 18:16:49 -08:00
dn.h	decnet: net/dn.h needs net/flow.h	2012-02-15 16:37:44 -05:00
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h
dsa.h	dsa: Include linux/if_ether.h to fix build error	2011-12-01 11:41:06 -05:00
dsfield.h
dst.h	ipv6: fix incorrect ipsec fragment	2012-06-10 00:36:15 +09:00
dst_ops.h	net: Rename the dst_opt default_mtu method to mtu	2011-11-26 14:29:50 -05:00
esp.h
ethoc.h
fib_rules.h
flow.h	ipv4: reset flowi parameters on route connect	2012-02-04 19:29:48 -05:00
flow_keys.h	flow_dissector: use a 64bit load/store	2011-11-29 13:17:03 -05:00
garp.h
gen_stats.h
genetlink.h	net: Deinline __nlmsg_put and genlmsg_put. -7k code on i386 defconfig.	2012-01-30 15:22:06 -05:00
gre.h
icmp.h	ipv4: reduce percpu needs for icmpmsg mibs	2011-11-09 16:04:20 -05:00
ieee80211_radiotap.h	wireless: move ieee80211chan2mhz macro	2011-11-11 12:32:50 -05:00
ieee802154.h	6LoWPAN: add fragmentation support	2011-11-14 00:19:42 -05:00
ieee802154_netdev.h
if_inet6.h	ipv6: updates to privacy addresses per RFC 4941.	2011-08-01 18:05:00 -07:00
inet6_connection_sock.h
inet6_hashtables.h	ipv6: use a stronger hash for tcp	2013-02-28 06:59:06 -08:00
inet_common.h
inet_connection_sock.h	inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock	2013-01-11 09:07:14 -08:00
inet_ecn.h	inet: add rfc 3168 extract in front of INET_ECN_encapsulate()	2011-10-22 01:25:23 -04:00
inet_frag.h	inet: limit length of fragment queue hash table bucket lists	2013-03-28 12:11:54 -07:00
inet_hashtables.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
inet_sock.h	ipv6: use a stronger hash for tcp	2013-02-28 06:59:06 -08:00
inet_timewait_sock.h	inet: remove rcu protection on tw_net	2011-12-14 13:34:55 -05:00
inetpeer.h	inetpeer: fix a race in inetpeer_gc_worker()	2012-07-16 09:03:45 -07:00
ip.h	ipv4: Make ip_call_ra_chain() return bool.	2012-03-09 14:34:50 -08:00
ip6_checksum.h
ip6_fib.h	ipv6: clean up rt6_clean_expires	2012-04-17 22:31:59 -04:00
ip6_route.h	Merge branch 'nf-next' of git://1984.lsi.us.es/net-next	2011-12-25 02:21:45 -05:00
ip6_tunnel.h
ip_fib.h	ipv4: fix definition of FIB_TABLE_HASHSZ	2013-03-28 12:11:53 -07:00
ip_vs.h	ipvs: fix oops on NAT reply in br_nf context	2012-10-21 09:28:00 -07:00
ipcomp.h
ipconfig.h
ipip.h
ipv6.h	ipv6: use a stronger hash for tcp	2013-02-28 06:59:06 -08:00
ipx.h
iw_handler.h
lapb.h	wan: make LAPB callbacks const	2011-09-16 19:20:20 -04:00
lib80211.h	include: replace linux/module.h with "struct module" wherever possible	2011-10-31 19:32:32 -04:00
llc.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
mac80211.h	mac80211: Convert WARN_ON to WARN_ON_ONCE	2012-04-09 15:54:48 -04:00
mip6.h
mld.h
ndisc.h	ipv6: Remove neigh argument from ndisc_send_redirect()	2012-01-27 21:00:08 -05:00
neighbour.h	ipv6: Use universal hash for NDISC.	2011-12-28 15:06:58 -05:00
net_namespace.h	net: use IS_ENABLED(CONFIG_IPV6)	2011-12-11 18:25:16 -05:00
net_ratelimit.h
netdma.h
netevent.h
netlabel.h	doc: Update the email address for Paul Moore in various source files	2011-08-01 17:58:33 -07:00
netlink.h	net: Deinline __nlmsg_put and genlmsg_put. -7k code on i386 defconfig.	2012-01-30 15:22:06 -05:00
netprio_cgroup.h	netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m	2012-02-10 15:08:57 -05:00
netrom.h
nexthop.h
nl802154.h
p8022.h
ping.h
pkt_cls.h
pkt_sched.h
protocol.h	net: use IS_ENABLED(CONFIG_IPV6)	2011-12-11 18:25:16 -05:00
psnap.h
raw.h
rawv6.h
red.h	net_sched: red: Make minor corrections to comments	2012-04-16 23:53:11 -04:00
regulatory.h	cfg80211: pass DFS region to drivers through reg_notifier()	2011-11-21 16:20:41 -05:00
request_sock.h	tcp: Change possible SYN flooding messages	2011-09-15 14:49:43 -04:00
rose.h
route.h	ipv4: reset flowi parameters on route connect	2012-02-04 19:29:48 -05:00
rtnetlink.h	rtnetlink: Fix problem with buffer allocation	2012-02-21 16:56:45 -05:00
sch_generic.h	bonding: Fix corrupted queue_mapping	2012-07-16 09:03:47 -07:00
scm.h	net: fix incorrect credentials passing	2013-05-01 09:41:16 -07:00
secure_seq.h	tcp: add const qualifiers where possible	2011-10-21 05:22:42 -04:00
slhc_vj.h
snmp.h	Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2012-01-09 13:08:28 -08:00
sock.h	ipv6: do not clear pinet6 field	2013-05-19 10:54:47 -07:00
stp.h
tcp.h	tcp: force a dst refcount when prequeue packet	2013-05-19 10:54:43 -07:00
tcp_memcontrol.h	cgroup: remove cgroup_subsys argument from callbacks	2012-02-02 09:20:22 -08:00
tcp_states.h
timewait_sock.h	BUG: headers with BUG/BUG_ON etc. need linux/bug.h	2012-03-04 17:54:34 -05:00
transp_v6.h	net: relax PKTINFO non local ipv6 udp xmit check	2011-08-30 17:39:01 -04:00
udp.h	ipv6: call udp_push_pending_frames when uncorking a socket with AF_INET pending data	2013-07-28 16:26:02 -07:00
udplite.h	net: ipv4: Standardize prefixes for message logging	2012-03-12 17:05:21 -07:00
wext.h
wimax.h
wpan-phy.h	BUG: headers with BUG/BUG_ON etc. need linux/bug.h	2012-03-04 17:54:34 -05:00
x25.h
x25device.h
xfrm.h	xfrm: Workaround incompatibility of ESN and async crypto	2012-10-13 05:38:40 +09:00