[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] hw/net/can: sja1000 fix buff2frame_bas for dlc out of std CAN 8
From: |
Pavel Pisa |
Subject: |
[PATCH] hw/net/can: sja1000 fix buff2frame_bas for dlc out of std CAN 8 bytes |
Date: |
Mon, 26 Jul 2021 18:24:58 +0200 |
Problem reported by openEuler fuzz-sig group.
The buff2frame_bas function (hw\net\can\can_sja1000.c)
infoleak(qemu5.x~qemu6.x) or stack-overflow(qemu 4.x).
Reported-by: Qiang Ning <ningqiang1@huawei.com>
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
---
hw/net/can/can_sja1000.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
index 42d2f99dfb..64e81bff58 100644
--- a/hw/net/can/can_sja1000.c
+++ b/hw/net/can/can_sja1000.c
@@ -311,6 +311,10 @@ static void buff2frame_bas(const uint8_t *buff,
qemu_can_frame *frame)
}
frame->can_dlc = buff[1] & 0x0f;
+ if (frame->can_dlc > 8) {
+ frame->can_dlc = 8;
+ }
+
for (i = 0; i < frame->can_dlc; i++) {
frame->data[i] = buff[2 + i];
}
--
2.20.1
- [PATCH] hw/net/can: sja1000 fix buff2frame_bas for dlc out of std CAN 8 bytes,
Pavel Pisa <=