Skip to content

Commit 00f1cc1

Browse files
jwrdegoedegregkh
authored andcommitted
mei: vsc: Fix fortify-panic caused by invalid counted_by() use
gcc 15 honors the __counted_by(len) attribute on vsc_tp_packet.buf[] and the vsc-tp.c code is using this in a wrong way. len does not contain the available size in the buffer, it contains the actual packet length *without* the crc. So as soon as vsc_tp_xfer() tries to add the crc to buf[] the fortify-panic handler gets triggered: [ 80.842193] memcpy: detected buffer overflow: 4 byte write of buffer size 0 [ 80.842243] WARNING: CPU: 4 PID: 272 at lib/string_helpers.c:1032 __fortify_report+0x45/0x50 ... [ 80.843175] __fortify_panic+0x9/0xb [ 80.843186] vsc_tp_xfer.cold+0x67/0x67 [mei_vsc_hw] [ 80.843210] ? seqcount_lockdep_reader_access.constprop.0+0x82/0x90 [ 80.843229] ? lockdep_hardirqs_on+0x7c/0x110 [ 80.843250] mei_vsc_hw_start+0x98/0x120 [mei_vsc] [ 80.843270] mei_reset+0x11d/0x420 [mei] The easiest fix would be to just drop the counted-by but with the exception of the ack buffer in vsc_tp_xfer_helper() which only contains enough room for the packet-header, all other uses of vsc_tp_packet always use a buffer of VSC_TP_MAX_XFER_SIZE bytes for the packet. Instead of just dropping the counted-by, split the vsc_tp_packet struct definition into a header and a full-packet definition and use a fixed size buf[] in the packet definition, this way fortify-source buffer overrun checking still works when enabled. Fixes: 566f5ca ("mei: Add transport driver for IVSC device") Cc: stable@kernel.org Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Alexander Usyskin <alexander.usyskin@intel.com> Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com> Link: https://lore.kernel.org/r/20250318141203.94342-2-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent bcfb443 commit 00f1cc1

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

drivers/misc/mei/vsc-tp.c

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,24 @@
3636
#define VSC_TP_XFER_TIMEOUT_BYTES 700
3737
#define VSC_TP_PACKET_PADDING_SIZE 1
3838
#define VSC_TP_PACKET_SIZE(pkt) \
39-
(sizeof(struct vsc_tp_packet) + le16_to_cpu((pkt)->len) + VSC_TP_CRC_SIZE)
39+
(sizeof(struct vsc_tp_packet_hdr) + le16_to_cpu((pkt)->hdr.len) + VSC_TP_CRC_SIZE)
4040
#define VSC_TP_MAX_PACKET_SIZE \
41-
(sizeof(struct vsc_tp_packet) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE)
41+
(sizeof(struct vsc_tp_packet_hdr) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE)
4242
#define VSC_TP_MAX_XFER_SIZE \
4343
(VSC_TP_MAX_PACKET_SIZE + VSC_TP_XFER_TIMEOUT_BYTES)
4444
#define VSC_TP_NEXT_XFER_LEN(len, offset) \
45-
(len + sizeof(struct vsc_tp_packet) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE)
45+
(len + sizeof(struct vsc_tp_packet_hdr) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE)
4646

47-
struct vsc_tp_packet {
47+
struct vsc_tp_packet_hdr {
4848
__u8 sync;
4949
__u8 cmd;
5050
__le16 len;
5151
__le32 seq;
52-
__u8 buf[] __counted_by(len);
52+
};
53+
54+
struct vsc_tp_packet {
55+
struct vsc_tp_packet_hdr hdr;
56+
__u8 buf[VSC_TP_MAX_XFER_SIZE - sizeof(struct vsc_tp_packet_hdr)];
5357
};
5458

5559
struct vsc_tp {
@@ -158,12 +162,12 @@ static int vsc_tp_dev_xfer(struct vsc_tp *tp, void *obuf, void *ibuf, size_t len
158162
static int vsc_tp_xfer_helper(struct vsc_tp *tp, struct vsc_tp_packet *pkt,
159163
void *ibuf, u16 ilen)
160164
{
161-
int ret, offset = 0, cpy_len, src_len, dst_len = sizeof(struct vsc_tp_packet);
165+
int ret, offset = 0, cpy_len, src_len, dst_len = sizeof(struct vsc_tp_packet_hdr);
162166
int next_xfer_len = VSC_TP_PACKET_SIZE(pkt) + VSC_TP_XFER_TIMEOUT_BYTES;
163167
u8 *src, *crc_src, *rx_buf = tp->rx_buf;
164168
int count_down = VSC_TP_MAX_XFER_COUNT;
165169
u32 recv_crc = 0, crc = ~0;
166-
struct vsc_tp_packet ack;
170+
struct vsc_tp_packet_hdr ack;
167171
u8 *dst = (u8 *)&ack;
168172
bool synced = false;
169173

@@ -280,10 +284,10 @@ int vsc_tp_xfer(struct vsc_tp *tp, u8 cmd, const void *obuf, size_t olen,
280284

281285
guard(mutex)(&tp->mutex);
282286

283-
pkt->sync = VSC_TP_PACKET_SYNC;
284-
pkt->cmd = cmd;
285-
pkt->len = cpu_to_le16(olen);
286-
pkt->seq = cpu_to_le32(++tp->seq);
287+
pkt->hdr.sync = VSC_TP_PACKET_SYNC;
288+
pkt->hdr.cmd = cmd;
289+
pkt->hdr.len = cpu_to_le16(olen);
290+
pkt->hdr.seq = cpu_to_le32(++tp->seq);
287291
memcpy(pkt->buf, obuf, olen);
288292

289293
crc = ~crc32(~0, (u8 *)pkt, sizeof(pkt) + olen);

0 commit comments

Comments
 (0)