| From bippy-5f407fcff5a0 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| To: <linux-cve-announce@vger.kernel.org> |
| Reply-to: <cve@kernel.org>, <linux-kernel@vger.kernel.org> |
| Subject: CVE-2023-53029: octeontx2-pf: Fix the use of GFP_KERNEL in atomic context on rt |
| |
| Description |
| =========== |
| |
| In the Linux kernel, the following vulnerability has been resolved: |
| |
| octeontx2-pf: Fix the use of GFP_KERNEL in atomic context on rt |
| |
| The commit 4af1b64f80fb ("octeontx2-pf: Fix lmtst ID used in aura |
| free") uses the get/put_cpu() to protect the usage of percpu pointer |
| in ->aura_freeptr() callback, but it also unnecessarily disable the |
| preemption for the blockable memory allocation. The commit 87b93b678e95 |
| ("octeontx2-pf: Avoid use of GFP_KERNEL in atomic context") tried to |
| fix these sleep inside atomic warnings. But it only fix the one for |
| the non-rt kernel. For the rt kernel, we still get the similar warnings |
| like below. |
| BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:46 |
| in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1, name: swapper/0 |
| preempt_count: 1, expected: 0 |
| RCU nest depth: 0, expected: 0 |
| 3 locks held by swapper/0/1: |
| #0: ffff800009fc5fe8 (rtnl_mutex){+.+.}-{3:3}, at: rtnl_lock+0x24/0x30 |
| #1: ffff000100c276c0 (&mbox->lock){+.+.}-{3:3}, at: otx2_init_hw_resources+0x8c/0x3a4 |
| #2: ffffffbfef6537e0 (&cpu_rcache->lock){+.+.}-{2:2}, at: alloc_iova_fast+0x1ac/0x2ac |
| Preemption disabled at: |
| [<ffff800008b1908c>] otx2_rq_aura_pool_init+0x14c/0x284 |
| CPU: 20 PID: 1 Comm: swapper/0 Tainted: G W 6.2.0-rc3-rt1-yocto-preempt-rt #1 |
| Hardware name: Marvell OcteonTX CN96XX board (DT) |
| Call trace: |
| dump_backtrace.part.0+0xe8/0xf4 |
| show_stack+0x20/0x30 |
| dump_stack_lvl+0x9c/0xd8 |
| dump_stack+0x18/0x34 |
| __might_resched+0x188/0x224 |
| rt_spin_lock+0x64/0x110 |
| alloc_iova_fast+0x1ac/0x2ac |
| iommu_dma_alloc_iova+0xd4/0x110 |
| __iommu_dma_map+0x80/0x144 |
| iommu_dma_map_page+0xe8/0x260 |
| dma_map_page_attrs+0xb4/0xc0 |
| __otx2_alloc_rbuf+0x90/0x150 |
| otx2_rq_aura_pool_init+0x1c8/0x284 |
| otx2_init_hw_resources+0xe4/0x3a4 |
| otx2_open+0xf0/0x610 |
| __dev_open+0x104/0x224 |
| __dev_change_flags+0x1e4/0x274 |
| dev_change_flags+0x2c/0x7c |
| ic_open_devs+0x124/0x2f8 |
| ip_auto_config+0x180/0x42c |
| do_one_initcall+0x90/0x4dc |
| do_basic_setup+0x10c/0x14c |
| kernel_init_freeable+0x10c/0x13c |
| kernel_init+0x2c/0x140 |
| ret_from_fork+0x10/0x20 |
| |
| Of course, we can shuffle the get/put_cpu() to only wrap the invocation |
| of ->aura_freeptr() as what commit 87b93b678e95 does. But there are only |
| two ->aura_freeptr() callbacks, otx2_aura_freeptr() and |
| cn10k_aura_freeptr(). There is no usage of perpcu variable in the |
| otx2_aura_freeptr() at all, so the get/put_cpu() seems redundant to it. |
| We can move the get/put_cpu() into the corresponding callback which |
| really has the percpu variable usage and avoid the sprinkling of |
| get/put_cpu() in several places. |
| |
| The Linux kernel CVE team has assigned CVE-2023-53029 to this issue. |
| |
| |
| Affected and fixed versions |
| =========================== |
| |
| Issue introduced in 5.15.87 with commit 6ea5273c71dd2d07c0a2459594eb34bc087939f7 and fixed in 5.15.91 with commit 29e9c67bf3271067735c188e95cf3631ecd64d58 |
| Issue introduced in 6.1.5 with commit 667ce030bdfb62a86266444b2c3fd6ab98b9df9b and fixed in 6.1.8 with commit 659518e013d6bd562bb0f1d2d9f99d0ac54720e2 |
| Issue introduced in 6.0.19 with commit b754dc7c933dd9464223f64b10d33d68ab086cc6 |
| |
| Please see https://www.kernel.org for a full list of currently supported |
| kernel versions by the kernel community. |
| |
| Unaffected versions might change over time as fixes are backported to |
| older supported kernel versions. The official CVE entry at |
| https://cve.org/CVERecord/?id=CVE-2023-53029 |
| will be updated if fixes are backported, please check that for the most |
| up to date information about this issue. |
| |
| |
| Affected files |
| ============== |
| |
| The file(s) affected by this issue are: |
| drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c |
| drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h |
| |
| |
| Mitigation |
| ========== |
| |
| The Linux kernel CVE team recommends that you update to the latest |
| stable kernel version for this, and many other bugfixes. Individual |
| changes are never tested alone, but rather are part of a larger kernel |
| release. Cherry-picking individual commits is not recommended or |
| supported by the Linux kernel community at all. If however, updating to |
| the latest release is impossible, the individual changes to resolve this |
| issue can be found at these commits: |
| https://git.kernel.org/stable/c/29e9c67bf3271067735c188e95cf3631ecd64d58 |
| https://git.kernel.org/stable/c/659518e013d6bd562bb0f1d2d9f99d0ac54720e2 |
| https://git.kernel.org/stable/c/55ba18dc62deff5910c0fa64486dea1ff20832ff |