Eric Dumazet eeea10b83a tcp: add tcp_v4_fill_cb()/tcp_v4_restore_cb() ... James Morris reported kernel stack corruption bug [1] while running the SELinux testsuite, and bisected to a recent commit bffa72cf7f ("net: sk_buff rbnode reorg") We believe this commit is fine, but exposes an older bug. SELinux code runs from tcp_filter() and might send an ICMP, expecting IP options to be found in skb->cb[] using regular IPCB placement. We need to defer TCP mangling of skb->cb[] after tcp_filter() calls. This patch adds tcp_v4_fill_cb()/tcp_v4_restore_cb() in a very similar way we added them for IPv6. [1] [ 339.806024] SELinux: failure in selinux_parse_skb(), unable to parse packet [ 339.822505] Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: ffffffff81745af5 [ 339.822505] [ 339.852250] CPU: 4 PID: 3642 Comm: client Not tainted 4.15.0-rc1-test #15 [ 339.868498] Hardware name: LENOVO 10FGS0VA1L/30BC, BIOS FWKT68A 01/19/2017 [ 339.885060] Call Trace: [ 339.896875] <IRQ> [ 339.908103] dump_stack+0x63/0x87 [ 339.920645] panic+0xe8/0x248 [ 339.932668] ? ip_push_pending_frames+0x33/0x40 [ 339.946328] ? icmp_send+0x525/0x530 [ 339.958861] ? kfree_skbmem+0x60/0x70 [ 339.971431] __stack_chk_fail+0x1b/0x20 [ 339.984049] icmp_send+0x525/0x530 [ 339.996205] ? netlbl_skbuff_err+0x36/0x40 [ 340.008997] ? selinux_netlbl_err+0x11/0x20 [ 340.021816] ? selinux_socket_sock_rcv_skb+0x211/0x230 [ 340.035529] ? security_sock_rcv_skb+0x3b/0x50 [ 340.048471] ? sk_filter_trim_cap+0x44/0x1c0 [ 340.061246] ? tcp_v4_inbound_md5_hash+0x69/0x1b0 [ 340.074562] ? tcp_filter+0x2c/0x40 [ 340.086400] ? tcp_v4_rcv+0x820/0xa20 [ 340.098329] ? ip_local_deliver_finish+0x71/0x1a0 [ 340.111279] ? ip_local_deliver+0x6f/0xe0 [ 340.123535] ? ip_rcv_finish+0x3a0/0x3a0 [ 340.135523] ? ip_rcv_finish+0xdb/0x3a0 [ 340.147442] ? ip_rcv+0x27c/0x3c0 [ 340.158668] ? inet_del_offload+0x40/0x40 [ 340.170580] ? __netif_receive_skb_core+0x4ac/0x900 [ 340.183285] ? rcu_accelerate_cbs+0x5b/0x80 [ 340.195282] ? __netif_receive_skb+0x18/0x60 [ 340.207288] ? process_backlog+0x95/0x140 [ 340.218948] ? net_rx_action+0x26c/0x3b0 [ 340.230416] ? __do_softirq+0xc9/0x26a [ 340.241625] ? do_softirq_own_stack+0x2a/0x40 [ 340.253368] </IRQ> [ 340.262673] ? do_softirq+0x50/0x60 [ 340.273450] ? __local_bh_enable_ip+0x57/0x60 [ 340.285045] ? ip_finish_output2+0x175/0x350 [ 340.296403] ? ip_finish_output+0x127/0x1d0 [ 340.307665] ? nf_hook_slow+0x3c/0xb0 [ 340.318230] ? ip_output+0x72/0xe0 [ 340.328524] ? ip_fragment.constprop.54+0x80/0x80 [ 340.340070] ? ip_local_out+0x35/0x40 [ 340.350497] ? ip_queue_xmit+0x15c/0x3f0 [ 340.361060] ? __kmalloc_reserve.isra.40+0x31/0x90 [ 340.372484] ? __skb_clone+0x2e/0x130 [ 340.382633] ? tcp_transmit_skb+0x558/0xa10 [ 340.393262] ? tcp_connect+0x938/0xad0 [ 340.403370] ? ktime_get_with_offset+0x4c/0xb0 [ 340.414206] ? tcp_v4_connect+0x457/0x4e0 [ 340.424471] ? __inet_stream_connect+0xb3/0x300 [ 340.435195] ? inet_stream_connect+0x3b/0x60 [ 340.445607] ? SYSC_connect+0xd9/0x110 [ 340.455455] ? __audit_syscall_entry+0xaf/0x100 [ 340.466112] ? syscall_trace_enter+0x1d0/0x2b0 [ 340.476636] ? __audit_syscall_exit+0x209/0x290 [ 340.487151] ? SyS_connect+0xe/0x10 [ 340.496453] ? do_syscall_64+0x67/0x1b0 [ 340.506078] ? entry_SYSCALL64_slow_path+0x25/0x25 Fixes: 971f10eca1 ("tcp: better TCP_SKB_CB layout to reduce cache line misses") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: James Morris <james.l.morris@oracle.com> Tested-by: James Morris <james.l.morris@oracle.com> Tested-by: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-03 12:39:14 -05:00
..
ila	ila: Add a hook type for LWT routes	2017-11-08 11:20:49 +09:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2017-11-08 14:22:50 +09:00
addrconf_core.c	net: ipv6: Make inet6addr_validator a blocking notifier	2017-10-20 13:15:07 +01:00
addrconf.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
addrlabel.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
af_inet6.c	ipv6: Implement limits on Hop-by-Hop and Destination options	2017-11-03 09:50:22 +09:00
ah6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-11-15 11:56:19 -08:00
anycast.c	net, ipv6: convert ifacaddr6.aca_refcnt from atomic_t to refcount_t	2017-07-04 01:29:04 -07:00
calipso.c	net, calipso: convert calipso_doi.refcount from atomic_t to refcount_t	2017-07-04 22:35:16 +01:00
datagram.c	net: convert sock.sk_refcnt from atomic_t to refcount_t	2017-07-01 07:39:08 -07:00
esp6_offload.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-09-01 17:42:05 -07:00
esp6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-11-15 11:56:19 -08:00
exthdrs_core.c	net: ipv6: remove unused code in ipv6_find_hdr()	2017-10-05 21:53:02 -07:00
exthdrs_offload.c
exthdrs.c	ipv6: Implement limits on Hop-by-Hop and Destination options	2017-11-03 09:50:22 +09:00
fib6_notifier.c	net: Add module reference to FIB notifiers	2017-09-01 20:33:42 -07:00
fib6_rules.c	net: ipv6: avoid overhead when no custom FIB rules are installed	2017-08-08 21:40:08 -07:00
fou6.c	fou: make local function static	2017-05-21 13:42:36 -04:00
icmp.c	ipv6: mark expected switch fall-throughs	2017-10-18 14:13:08 +01:00
inet6_connection_sock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
inet6_hashtables.c	net: ipv6: add second dif to inet6 socket lookups	2017-08-07 11:39:22 -07:00
ip6_checksum.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
ip6_fib.c	treewide: setup_timer() -> timer_setup() (2 field)	2017-11-21 15:57:09 -08:00
ip6_flowlabel.c	treewide: Switch DEFINE_TIMER callbacks to struct timer_list *	2017-11-21 15:57:05 -08:00
ip6_gre.c	gre6: use log_ecn_error module parameter in ip6_tnl_rcv()	2017-11-19 12:22:19 +09:00
ip6_icmp.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
ip6_input.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-20 10:35:33 -04:00
ip6_offload.c	gso: fix payload length when gso_size is zero	2017-10-08 10:12:15 -07:00
ip6_offload.h	udp: Add GRO functions to UDP socket	2016-04-07 16:53:29 -04:00
ip6_output.c	ipv6: flowlabel: do not leave opt->tot_len with garbage	2017-10-22 03:22:24 +01:00
ip6_tunnel.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-11-15 11:56:19 -08:00
ip6_udp_tunnel.c	ip6_udp_tunnel: remove unused IPCB related codes	2016-11-02 15:18:36 -04:00
ip6_vti.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-05 18:19:22 -07:00
ip6mr.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
ipcomp6.c	net: inet: Support UID-based routing in IP protocols.	2016-11-04 14:45:23 -04:00
ipv6_sockglue.c	net-ipv6: add support for sockopt(SOL_IPV6, IPV6_FREEBIND)	2017-09-30 05:30:52 +01:00
Kconfig	ipv6: sr: add helper functions for seg6local	2017-08-25 17:10:24 -07:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mcast_snoop.c
mcast.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
mip6.c	ktime: Get rid of ktime_equal()	2016-12-25 17:21:23 +01:00
ndisc.c	net: ipv6: sysctl to specify IPv6 ND traffic class	2017-11-11 15:13:02 +09:00
netfilter.c	net: inet: Support UID-based routing in IP protocols.	2016-11-04 14:45:23 -04:00
output_core.c	net: accept UFO datagrams from tuntap and packet	2017-11-24 01:37:35 +09:00
ping.c	net/ipv6: Convert icmpv6_push_pending_frames to void	2017-10-06 09:52:31 -07:00
proc.c	proc: snmp6: Use correct type in memset	2017-06-12 09:53:14 -04:00
protocol.c	net: Add sysctl to toggle early demux for tcp and udp	2017-03-24 13:17:07 -07:00
raw.c	ipv6: mark expected switch fall-throughs	2017-10-18 14:13:08 +01:00
reassembly.c	inet: frags: Convert timers to use timer_setup()	2017-10-18 12:39:55 +01:00
route.c	net: ipv6: Fixup device for anycast routes during copy	2017-11-24 01:34:52 +09:00
seg6_hmac.c	ipv6: sr: Use ARRAY_SIZE macro	2017-09-01 18:35:23 -07:00
seg6_iptunnel.c	ipv6: sr: add support for encapsulation of L2 frames	2017-08-25 17:10:23 -07:00
seg6_local.c	ipv6: sr: remove duplicate routing header type check	2017-09-11 14:34:10 -07:00
seg6.c	ipv6: sr: define core operations for seg6local lightweight tunnel	2017-08-07 14:16:22 -07:00
sit.c	sit: update frag_off info	2017-11-30 10:25:41 -05:00
syncookies.c	tcp: Namespace-ify sysctl_tcp_workaround_signed_windows	2017-10-28 19:24:38 +09:00
sysctl_net_ipv6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
tcp_ipv6.c	tcp: add tcp_v4_fill_cb()/tcp_v4_restore_cb()	2017-12-03 12:39:14 -05:00
tcpv6_offload.c
tunnel6.c
udp_impl.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
udp_offload.c	net: accept UFO datagrams from tuntap and packet	2017-11-24 01:37:35 +09:00
udp.c	locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()	2017-10-25 11:01:08 +02:00
udplite.c	udplite: call proper backlog handlers	2016-11-24 15:32:14 -05:00
xfrm6_input.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xfrm6_mode_beet.c	networking: make skb_pull & friends return void pointers	2017-06-16 11:48:39 -04:00
xfrm6_mode_ro.c	ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()	2017-06-02 13:57:27 -04:00
xfrm6_mode_transport.c	ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()	2017-06-02 13:57:27 -04:00
xfrm6_mode_tunnel.c	xfrm: Add encapsulation header offsets while SKB is not encrypted	2017-04-14 10:07:39 +02:00
xfrm6_output.c	xfrm: Add an IPsec hardware offloading API	2017-04-14 10:06:10 +02:00
xfrm6_policy.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
xfrm6_protocol.c	xfrm: input: constify xfrm_input_afinfo	2017-02-09 10:22:17 +01:00
xfrm6_state.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xfrm6_tunnel.c	xfrm6_tunnel: exit_net cleanup check added	2017-11-14 15:46:17 +09:00