8b356aa11f
Replaces the 13 broken DKMS-path -danctnix mirrors from PR #17 + adds 9 new series-dirs for the c-stack patches that were never split (Patches A/B/C-v3/F/D/E/C2/G/H) + retires the cumulative-c5x-danctnix single-file interim from fleet/ohm.yaml. Mechanism: cd marfrit/bes2600-dkms-mobian git format-patch fe73571..cleanups --no-merges -o /tmp/cleanups/ git format-patch cleanups..bes2600/bh-c-fossil-cleanup --no-merges -o /tmp/h/ for each commit: route to series-dir, sed-rewrite a/bes2600/foo.c -> a/drivers/staging/bes2600/foo.c The 29 cleanups commits + 1 Patch H commit map to 25 series-dirs (a few series-dirs get multiple commits: lmac-recover gets c5.2 + c5.2.1 as 0001+0002; cw1200-fix-backports gets F3+F2+F1 as 0001-0003; factory-series gets request_firmware + STANDARD_FACTORY_EFUSE_FLAG as 0001+0002). fleet/ohm.yaml apply order matches cleanups commit chronology, which is what produced the working c5x interim. cumulative.patch from ka-promote ohm now has 32 resolved patches (29 cleanups + 1 Patch H + scan-filter-5ghz + xor-neon SCS + besser#18-fix), 276 079 bytes, b2sum 7418db5ddf8fe938b130bc9d0e9f7dc9060f3a13703cd50757835ac43140a13... Apply order in cleanups + bh-c-fossil-cleanup: 1 factory-series (c1 + factory-no-efuse-flag) 3 factory-thread-dev 4 pm-gate-on-handshake 5 remove-chardev-user-interface 6 enable-testmode 7 tx-sdio-dma-oob-danctnix (was 'staging-prep-series') 8 factory-drop-kernel-write-danctnix 9 drop-dpd-file-paths-danctnix 10 drop-orphan-file-io-danctnix 11 pm-timeout-silence-danctnix 12 scan-defer-on-reject-danctnix (c5.1) 13 scan-defer-backoff-tune-danctnix (c5.1.1) 14 lmac-recover-via-mmc-hw-reset-danctnix (c5.2 + c5.2.1) 16 pm-state-resync-danctnix (c6.1) 17 pm-wake-consume-state-danctnix (c6.2) 18 pm-detect-firmware-unsupported-danctnix (c7) 19 decrypt-storm-fast-recover-danctnix (Patch A) 20 connection-loss-fast-recover-danctnix (Patch B) 21 cw1200-fix-backports-danctnix (Patches F3 + F2 + F1) 24 sdio-rx-no-relay-danctnix (Patch C v3) 25 license-spdx-restore-attribution-danctnix (Patch G) 26 ba-lock-atomic-danctnix (Patch D) 27 ps-state-lock-skip-pm-disabled-danctnix (Patch E) 28 rx-list-batch-delivery-danctnix (Patch C2) 29 bh-c-fossil-cleanup-danctnix (Patch H) 30 scan-filter-5ghz-danctnix (besser#1) 31 arch/arm64/xor-neon-... (GCC 15 SCS) 32 queue-pending-record-lock-bh-danctnix (besser#18) Verification: pkgrel=6 build from this manifest in progress; if srcversion == 26B0003FE9F2B05DCE838C4 (pkgrel=5's), source-tree is byte-equivalent to the c5x interim + scan-filter + besser#18 stack that's currently running on ohm. Refs: #17 (the broken mirror), #28 (the interim PR that landed cumulative-c5x), #31 (ka-promote trailer normalisation followup).
124 lines
4.4 KiB
Diff
124 lines
4.4 KiB
Diff
From 315986ea27e7508275e71a070461d243ce1a1058 Mon Sep 17 00:00:00 2001
|
|
From: Markus Fritsche <fritsche.markus@gmail.com>
|
|
Date: Thu, 23 Apr 2026 11:58:31 +0200
|
|
Subject: [PATCH 07/29] bes2600: bounce SDIO TX buffers to avoid DMA OOB read
|
|
|
|
The SDIO TX path rounds the DMA transfer length up to the host's
|
|
current block size and hands that length to dma_map_sg() via
|
|
sg_set_buf(&sg[scatters], tx_buffer->buf, align) in sdio_tx_work().
|
|
tx_buffer->buf typically aliases into an skb linear head whose
|
|
allocated size matches tx_buffer->len, not the block-aligned
|
|
align. The DMA engine (swiotlb / dw_mci IDMAC) therefore reads up
|
|
to one block past the end of the skb. On a PineTab2 with KFENCE
|
|
enabled this fires as:
|
|
|
|
BUG: KFENCE: out-of-bounds read in __pi_memcpy_generic
|
|
Out-of-bounds read at ... (704B right of kfence-#...):
|
|
__pi_memcpy_generic
|
|
swiotlb_tbl_map_single
|
|
swiotlb_map
|
|
dma_direct_map_sg
|
|
__dma_map_sg_attrs
|
|
dma_map_sg_attrs
|
|
dw_mci_pre_dma_transfer
|
|
__dw_mci_start_request
|
|
...
|
|
bes_sdio_memcpy_to_io_helper+0x18c/0x288 [bes2600]
|
|
sdio_tx_work+0x2b4/0x4a0 [bes2600]
|
|
|
|
allocated by ... pskb_expand_head / validate_xmit_skb / tcp_*
|
|
|
|
In addition to being undefined behavior, the padding bytes (which
|
|
come from whatever memory follows the skb) are transmitted to the
|
|
peer, leaking kernel memory on the air.
|
|
|
|
Allocate a driver-owned DMA-page bounce buffer sized to
|
|
MAX_SDIO_TRANSFER_LEN and use it as the scatter-gather backing for
|
|
sdio_tx_work. Each TX buffer is copied into its bounce slot and the
|
|
tail (align - tx_buffer->len bytes) is zeroed. This mirrors the
|
|
existing bounce pattern already used by bes2600_sdio_memcpy_toio()
|
|
via single_gathered_buffer; a separate allocation is used for the
|
|
TX path because single_gathered_buffer is only serialised via
|
|
sdio_claim_host and sdio_tx_work accumulates scatter entries before
|
|
claiming the bus.
|
|
|
|
Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
|
|
---
|
|
bes2600/bes2600_sdio.c | 39 ++++++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 38 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/staging/bes2600/bes2600_sdio.c b/drivers/staging/bes2600/bes2600_sdio.c
|
|
index 371ef4f..3e04e8c 100644
|
|
--- a/drivers/staging/bes2600/bes2600_sdio.c
|
|
+++ b/drivers/staging/bes2600/bes2600_sdio.c
|
|
@@ -95,6 +95,7 @@ struct sbus_priv {
|
|
struct work_struct tx_work;
|
|
struct scatterlist tx_sg[BES_SDIO_TX_MULTIPLE_NUM + 1];
|
|
struct scatterlist tx_sg_nosignal[BES_SDIO_TX_MULTIPLE_NUM_NOSIGNAL + 1];
|
|
+ u8 *tx_bounce;
|
|
u32 tx_data_cnt;
|
|
u32 tx_xfer_cnt;
|
|
u32 tx_proc_cnt;
|
|
@@ -1136,7 +1137,26 @@ static void sdio_tx_work(struct work_struct *work)
|
|
}
|
|
}
|
|
|
|
- sg_set_buf(&sg[scatters], tx_buffer->buf, align);
|
|
+ /*
|
|
+ * The transfer length is rounded up to the SDIO block
|
|
+ * size, but tx_buffer->buf is only tx_buffer->len bytes
|
|
+ * long (it usually aliases into an skb linear head).
|
|
+ * Copy into a driver-owned bounce buffer and zero-pad
|
|
+ * to the aligned size; otherwise DMA reads past the
|
|
+ * skb and leaks adjacent kernel memory on the wire --
|
|
+ * observed as KFENCE OOB reads from
|
|
+ * bes_sdio_memcpy_to_io_helper via dma_map_sg.
|
|
+ */
|
|
+ if (WARN_ON_ONCE(total_len + align > MAX_SDIO_TRANSFER_LEN))
|
|
+ goto flush_previous;
|
|
+ memcpy(self->tx_bounce + total_len,
|
|
+ tx_buffer->buf, tx_buffer->len);
|
|
+ if (align > tx_buffer->len)
|
|
+ memset(self->tx_bounce + total_len +
|
|
+ tx_buffer->len, 0,
|
|
+ align - tx_buffer->len);
|
|
+ sg_set_buf(&sg[scatters],
|
|
+ self->tx_bounce + total_len, align);
|
|
total_len += align;
|
|
++scatters;
|
|
/*del_node:*/
|
|
@@ -1857,6 +1877,17 @@ static int bes2600_sdio_probe(struct sdio_func *func,
|
|
if (!self->single_gathered_buffer)
|
|
return -ENOMEM;
|
|
#endif
|
|
+#ifdef BES_SDIO_TX_MULTIPLE_ENABLE
|
|
+ self->tx_bounce = (u8 *)__get_dma_pages(GFP_KERNEL,
|
|
+ get_order(MAX_SDIO_TRANSFER_LEN));
|
|
+ if (!self->tx_bounce) {
|
|
+#ifndef SDIO_HOST_ADMA_SUPPORT
|
|
+ free_pages((unsigned long)self->single_gathered_buffer,
|
|
+ get_order(MAX_SDIO_TRANSFER_LEN));
|
|
+#endif
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+#endif
|
|
#ifdef BES_SDIO_RXTX_TOGGLE
|
|
self->fw_started = false;
|
|
#endif
|
|
@@ -1985,6 +2016,12 @@ static void bes2600_sdio_remove(struct sdio_func *func)
|
|
if (self->single_gathered_buffer) {
|
|
free_pages((unsigned long)self->single_gathered_buffer, get_order(MAX_SDIO_TRANSFER_LEN));
|
|
}
|
|
+#endif
|
|
+#ifdef BES_SDIO_TX_MULTIPLE_ENABLE
|
|
+ if (self->tx_bounce) {
|
|
+ free_pages((unsigned long)self->tx_bounce,
|
|
+ get_order(MAX_SDIO_TRANSFER_LEN));
|
|
+ }
|
|
#endif
|
|
kfree(self);
|
|
}
|
|
--
|
|
2.54.0
|
|
|