[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/5] hw/net/can: sja1000 fix buff2frame_bas and buff2frame_pel whe
From: |
Jason Wang |
Subject: |
[PULL 2/5] hw/net/can: sja1000 fix buff2frame_bas and buff2frame_pel when dlc is out of std CAN 8 bytes |
Date: |
Mon, 2 Aug 2021 12:33:41 +0800 |
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
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>
---
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 42d2f99..34eea68 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];
}
--
2.7.4
- [PULL 0/5] Net patches, Jason Wang, 2021/08/02
- [PULL 1/5] hw/net/vmxnet3: Do not abort QEMU if guest specified bad queue numbers, Jason Wang, 2021/08/02
- [PULL 2/5] hw/net/can: sja1000 fix buff2frame_bas and buff2frame_pel when dlc is out of std CAN 8 bytes,
Jason Wang <=
- [PULL 3/5] hw/net: e1000: Correct the initial value of VET register, Jason Wang, 2021/08/02
- [PULL 4/5] hw/net: e1000e: Correct the initial value of VET register, Jason Wang, 2021/08/02
- [PULL 5/5] hw/net: e1000e: Don't zero out the VLAN tag in the legacy RX descriptor, Jason Wang, 2021/08/02
- Re: [PULL 0/5] Net patches, Peter Maydell, 2021/08/02