06c7333dfc
- Add stable patches from upstream: block-nvme-Fix-VFIO_MAP_DMA-failed-No-sp.patch hw-net-can-sja1000-fix-buff2frame_bas-an.patch hw-pci-host-q35-Ignore-write-of-reserved.patch OBS-URL: https://build.opensuse.org/request/show/910154 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=663
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
|
|
Date: Thu, 29 Jul 2021 14:33:27 +0200
|
|
Subject: hw/net/can: sja1000 fix buff2frame_bas and buff2frame_pel when dlc is
|
|
out of std CAN 8 bytes
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: 11744862f27b9ba6488a247d2fd6bb83d9bc3c8d
|
|
|
|
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>
|
|
Cc: qemu-stable@nongnu.org
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
|
|
---
|
|
hw/net/can/can_sja1000.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
|
|
index 42d2f99dfb1d3cd3fa26f56ccb8d..34eea684ced278738bdb26327100 100644
|
|
--- a/hw/net/can/can_sja1000.c
|
|
+++ b/hw/net/can/can_sja1000.c
|
|
@@ -275,6 +275,10 @@ static void buff2frame_pel(const uint8_t *buff, qemu_can_frame *frame)
|
|
}
|
|
frame->can_dlc = buff[0] & 0x0f;
|
|
|
|
+ if (frame->can_dlc > 8) {
|
|
+ frame->can_dlc = 8;
|
|
+ }
|
|
+
|
|
if (buff[0] & 0x80) { /* Extended */
|
|
frame->can_id |= QEMU_CAN_EFF_FLAG;
|
|
frame->can_id |= buff[1] << 21; /* ID.28~ID.21 */
|
|
@@ -311,6 +315,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];
|
|
}
|