[PATCH v2 2/2] mailbox: ti-msgmgr: Read exact number of trailing message bytes
From: Beleswar Padhi
Date: Wed Sep 30 2026 - 12:08:30 EST
ti_msgmgr_send_data() copies the message to the data registers in u32
units. This has been harmless so far because the clients (TI-SCI)
always passed its preallocated message buffer, which is sized to the
maximum message size (60 or 64 bytes, a multiple of 4), so the extra
bytes read were still within the buffer. But, with a later TI-SCI
update, the message size can be varying now and not guaranteed to be a
multiple of 4, which would trigger KASAN out-of-bounds reports.
Therefore, memcpy() only the trailing bytes into a zeroed u32 before
writing it to the register. This is at most 3 bytes, so the overhead
is negligible.
Signed-off-by: Beleswar Padhi <b-padhi@xxxxxx>
---
v2: Changelog:
1. Use memcpy() to construct the trailing word to handle host
endianness. (Sashiko bot)
Link to v1:
https://lore.kernel.org/all/20260929200159.4033010-3-b-padhi@xxxxxx/
drivers/mailbox/ti-msgmgr.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/mailbox/ti-msgmgr.c b/drivers/mailbox/ti-msgmgr.c
index 425d5f9d9d0e3..e04b7f721ac8e 100644
--- a/drivers/mailbox/ti-msgmgr.c
+++ b/drivers/mailbox/ti-msgmgr.c
@@ -20,6 +20,7 @@
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/soc/ti/ti-msgmgr.h>
+#include <linux/string.h>
#define Q_DATA_OFFSET(proxy, queue, reg) \
((0x10000 * (proxy)) + (0x80 * (queue)) + ((reg) * 4))
@@ -425,10 +426,15 @@ static int ti_msgmgr_send_data(struct mbox_chan *chan, void *data)
trail_bytes = message->len % sizeof(u32);
if (trail_bytes) {
- u32 data_trail = *word_data;
-
- /* Ensure all unused data is 0 */
- data_trail &= 0xFFFFFFFF >> (8 * (sizeof(u32) - trail_bytes));
+ /*
+ * Copy only the trailing bytes instead of reading a full u32,
+ * as the message buffer may end right after them and a u32
+ * read would go past the end of it. This also leaves all
+ * unused data as 0.
+ */
+ u32 data_trail = 0;
+
+ memcpy(&data_trail, word_data, trail_bytes);
writel(data_trail, data_reg);
data_reg += sizeof(u32);
}
--
2.34.1