xfrm: policy: Fix out-of-bound array accesses in __xfrm_policy_unlink
Subsystems (4)
Sasha Levin
maintainerPATCH 1/6 xfrm: policy: Fix out-of-bound array accesses in __xfrm_policy_unlink
From: YueHaibing <[email protected]>
[ Upstream commit b805d78d300bcf2c83d6df7da0c818b0fee41427 ]
UBSAN report this:
UBSAN: Undefined behaviour in net/xfrm/xfrm_policy.c:1289:24 index 6 is out of range for type 'unsigned int [6]' CPU: 1 PID: 0 Comm: swapper/1 Not tainted 4.4.162-514.55.6.9.x86_64+ #13 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 0000000000000000 1466cf39b41b23c9 ffff8801f6b07a58 ffffffff81cb35f4 0000000041b58ab3 ffffffff83230f9c ffffffff81cb34e0 ffff8801f6b07a80 ffff8801f6b07a20 1466cf39b41b23c9 ffffffff851706e0 ffff8801f6b07ae8 Call Trace: <IRQ> [<ffffffff81cb35f4>] __dump_stack lib/dump_stack.c:15 [inline] <IRQ> [<ffffffff81cb35f4>] dump_stack+0x114/0x1a0 lib/dump_stack.c:51 [<ffffffff81d94225>] ubsan_epilogue+0x12/0x8f lib/ubsan.c:164 [<ffffffff81d954db>] __ubsan_handle_out_of_bounds+0x16e/0x1b2 lib/ubsan.c:382 [<ffffffff82a25acd>] __xfrm_policy_unlink+0x3dd/0x5b0 net/xfrm/xfrm_policy.c:1289 [<ffffffff82a2e572>] xfrm_policy_delete+0x52/0xb0 net/xfrm/xfrm_policy.c:1309 [<ffffffff82a3319b>] xfrm_policy_timer+0x30b/0x590 net/xfrm/xfrm_policy.c:243 [<ffffffff813d3927>] call_timer_fn+0x237/0x990 kernel/time/timer.c:1144 [<ffffffff813d8e7e>] __run_timers kernel/time/timer.c:1218 [inline] [<ffffffff813d8e7e>] run_timer_softirq+0x6ce/0xb80 kernel/time/timer.c:1401 [<ffffffff8120d6f9>] __do_softirq+0x299/0xe10 kernel/softirq.c:273 [<ffffffff8120e676>] invoke_softirq kernel/softirq.c:350 [inline] [<ffffffff8120e676>] irq_exit+0x216/0x2c0 kernel/softirq.c:391 [<ffffffff82c5edab>] exiting_irq arch/x86/include/asm/apic.h:652 [inline] [<ffffffff82c5edab>] smp_apic_timer_interrupt+0x8b/0xc0 arch/x86/kernel/apic/apic.c:926 [<ffffffff82c5c985>] apic_timer_interrupt+0xa5/0xb0 arch/x86/entry/entry_64.S:735 <EOI> [<ffffffff81188096>] ? native_safe_halt+0x6/0x10 arch/x86/include/asm/irqflags.h:52 [<ffffffff810834d7>] arch_safe_halt arch/x86/include/asm/paravirt.h:111 [inline] [<ffffffff810834d7>] default_idle+0x27/0x430 arch/x86/kernel/process.c:446 [<ffffffff81085f05>] arch_cpu_idle+0x15/0x20 arch/x86/kernel/process.c:437 [<ffffffff8132abc3>] default_idle_call+0x53/0x90 kernel/sched/idle.c:92 [<ffffffff8132b32d>] cpuidle_idle_call kernel/sched/idle.c:156 [inline] [<ffffffff8132b32d>] cpu_idle_loop kernel/sched/idle.c:251 [inline] [<ffffffff8132b32d>] cpu_startup_entry+0x60d/0x9a0 kernel/sched/idle.c:299 [<ffffffff8113e119>] start_secondary+0x3c9/0x560 arch/x86/kernel/smpboot.c:245
The issue is triggered as this:
xfrm_add_policy
-->verify_newpolicy_info //check the index provided by user with XFRM_POLICY_MAX
//In my case, the index is 0x6E6BB6, so it pass the check.
-->xfrm_policy_construct //copy the user's policy and set xfrm_policy_timer
-->xfrm_policy_insert
--> __xfrm_policy_link //use the orgin dir, in my case is 2
--> xfrm_gen_index //generate policy index, there is 0x6E6BB6then xfrm_policy_timer be fired
xfrm_policy_timer
--> xfrm_policy_id2dir //get dir from (policy index & 7), in my case is 6 --> xfrm_policy_delete
--> __xfrm_policy_unlink //access policy_count[dir], trigger out of range access
Add xfrm_policy_id2dir check in verify_newpolicy_info, make sure the computed dir is valid, to fix the issue.
--- net/xfrm/xfrm_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_user.c +1 -1
@@ -1313,7 +1313,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p) ret =verify_policy_dir (p->dir);if (ret)return ret; -if (p->index && ((p->index &XFRM_POLICY_MAX ) != p->dir)) +if (p->index && (xfrm_policy_id2dir (p->index) != p->dir))return -EINVAL ;return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/6 xfrm6_tunnel: Fix potential panic when unloading xfrm6_tunnel module
From: Su Yanjun <[email protected]>
[ Upstream commit 6ee02a54ef990a71bf542b6f0a4e3321de9d9c66 ]
When unloading xfrm6_tunnel module, xfrm6_tunnel_fini directly frees the xfrm6_tunnel_spi_kmem. Maybe someone has gotten the xfrm6_tunnel_spi, so need to wait it.
--- net/ipv6/xfrm6_tunnel.c | 4 ++++ 1 file changed, 4 insertions(+)
net/ipv6/xfrm6_tunnel.c +4 -0
@@ -391,6 +391,10 @@ static void __exit xfrm6_tunnel_fini(void)xfrm6_tunnel_deregister (&xfrm6_tunnel_handler,AF_INET6 );xfrm_unregister_type (&xfrm6_tunnel_type,AF_INET6 );unregister_pernet_subsys (&xfrm6_tunnel_net_ops); +/* Someone maybe has gotten the xfrm6_tunnel_spi. +* So need to wait it. +*/ +rcu_barrier ();kmem_cache_destroy (xfrm6_tunnel_spi_kmem); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/6 vti4: ipip tunnel deregistration fixes.
In reply to Sasha LevinFrom: Jeremy Sowden <[email protected]>
[ Upstream commit 5483844c3fc18474de29f5d6733003526e0a9f78 ]
If tunnel registration failed during module initialization, the module would fail to deregister the IPPROTO_COMP protocol and would attempt to deregister the tunnel.
The tunnel was not deregistered during module-exit.
--- net/ipv4/ip_vti.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/ipv4/ip_vti.c +3 -2
@@ -618,9 +618,9 @@ static int __init vti_init(void)return err; rtnl_link_failed: -xfrm4_protocol_deregister (&vti_ipcomp4_protocol,IPPROTO_COMP ); -xfrm_tunnel_failed:xfrm4_tunnel_deregister (&ipip_handler,AF_INET ); +xfrm_tunnel_failed: +xfrm4_protocol_deregister (&vti_ipcomp4_protocol,IPPROTO_COMP ); xfrm_proto_comp_failed:xfrm4_protocol_deregister (&vti_ah4_protocol,IPPROTO_AH ); xfrm_proto_ah_failed:
@@ -635,6 +635,7 @@ static int __init vti_init(void) static void __exit vti_fini(void) {rtnl_link_unregister (&vti_link_ops); +xfrm4_tunnel_deregister (&ipip_handler,AF_INET );xfrm4_protocol_deregister (&vti_ipcomp4_protocol,IPPROTO_COMP );xfrm4_protocol_deregister (&vti_ah4_protocol,IPPROTO_AH );xfrm4_protocol_deregister (&vti_esp4_protocol,IPPROTO_ESP );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/6 mac80211: Fix kernel panic due to use of txq after free
In reply to Sasha LevinFrom: Bhagavathi Perumal S <[email protected]>
[ Upstream commit f1267cf3c01b12e0f843fb6a7450a7f0b2efab8a ]
The txq of vif is added to active_txqs list for ATF TXQ scheduling in the function ieee80211_queue_skb(), but it was not properly removed before freeing the txq object. It was causing use after free of the txq objects from the active_txqs list, result was kernel panic due to invalid memory access.
Fix kernel invalid memory access by properly removing txq object from active_txqs list before free the object.
--- net/mac80211/iface.c | 3 +++ 1 file changed, 3 insertions(+)
net/mac80211/iface.c +3 -0
@@ -1764,6 +1764,9 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata)list_del_rcu (&sdata->list);mutex_unlock (&sdata->local->iflist_mtx); +if (sdata->vif.txq) +ieee80211_txq_purge (sdata->local,to_txq_info (sdata->vif.txq)); +synchronize_rcu ();if (sdata->dev) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/6 ufs: fix braino in ufs_get_inode_gid() for solaris UFS flavour
In reply to Sasha LevinFrom: Al Viro <[email protected]>
[ Upstream commit 4e9036042fedaffcd868d7f7aa948756c48c637d ]
To choose whether to pick the GID from the old (16bit) or new (32bit) field, we should check if the old gid field is set to 0xffff. Mainline checks the old *UID* field instead - cut'n'paste from the corresponding code in ufs_get_inode_uid().
--- fs/ufs/util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ufs/util.h +1 -1
@@ -228,7 +228,7 @@ ufs_get_inode_gid(struct super_block *sb, struct ufs_inode *inode)case UFS_UID_44BSD :return fs32_to_cpu (sb, inode->ui_u3.ui_44.ui_gid);case UFS_UID_EFT : -if (inode->ui_u1.oldids.ui_suid ==0xFFFF ) +if (inode->ui_u1.oldids.ui_sgid ==0xFFFF )return fs32_to_cpu (sb, inode->ui_u3.ui_sun.ui_gid);/* Fall through */ default :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/6 perf bench numa: Add define for RUSAGE_THREAD if not present
In reply to Sasha LevinFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit bf561d3c13423fc54daa19b5d49dc15fafdb7acc ]
While cross building perf to the ARC architecture on a fedora 30 host, we were failing with:
CC /tmp/build/perf/bench/numa.o
bench/numa.c: In function ?worker_thread?:
bench/numa.c:1261:12: error: ?RUSAGE_THREAD? undeclared (first use in this function); did you mean ?SIGEV_THREAD??
getrusage(RUSAGE_THREAD, &rusage);
^~~~~~~~~~~~~
SIGEV_THREAD bench/numa.c:1261:12: note: each undeclared identifier is reported only once for each function it appears in
[perfbuilder at 60d5802468f6 perf]$ /arc_gnu_2019.03-rc1_prebuilt_uclibc_le_archs_linux_install/bin/arc-linux-gcc --version | head -1 arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2019.03-rc1) 8.3.1 20190225
[perfbuilder at 60d5802468f6 perf]$
Trying to reproduce a report by Vineet, I noticed that, with just cross-built zlib and numactl libraries, I ended up with the above failure.
So, since RUSAGE_THREAD is available as a define, check for that and numactl libraries, I ended up with the above failure.
So, since RUSAGE_THREAD is available as a define in the system headers, check if it is defined in the 'perf bench numa' sources and define it if not.
Now it builds and I have to figure out if the problem reported by Vineet only takes place if we have libelf or some other library available.
--- tools/perf/bench/numa.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/perf/bench/numa.c +4 -0
@@ -30,6 +30,10 @@#include <numa.h> #include <numaif.h> +#ifndef RUSAGE_THREAD +# define RUSAGE_THREAD 1 +#endif +/* * Regular printout to the terminal, supressed if -q is specified: */
Signature · 1 line
2.20.1