qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
To: qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>,
	Jason Wang <jasowang@redhat.com>
Cc: Vikram Garhwal <fnu.vikram@xilinx.com>,
	Qiang Ning <ningqiang1@huawei.com>,
	Jiri Novak <jnovak@fel.cvut.cz>,
	Oliver Hartkopp <socketcan@hartkopp.net>,
	Jin-Yang <jinyang.sia@gmail.com>,
	Ondrej Ille <ondrej.ille@gmail.com>,
	Jan Charvat <charvj10@fel.cvut.cz>,
	Jan Kiszka <jan.kiszka@siemens.com>,
	Pavel Pisa <pisa@cmp.felk.cvut.cz>
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	[thread overview]
Message-ID: <20210726162458.26197-1-pisa@cmp.felk.cvut.cz> (raw)

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



             reply	other threads:[~2021-07-26 16:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-26 16:24 Pavel Pisa [this message]
2021-07-29  9:19 ` [PATCH] hw/net/can: sja1000 fix buff2frame_bas for dlc out of std CAN 8 bytes Pavel Pisa
2021-07-29 10:03   ` [PATCH-for-6.1] " Philippe Mathieu-Daudé
2021-07-29 11:52     ` Pavel Pisa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210726162458.26197-1-pisa@cmp.felk.cvut.cz \
    --to=pisa@cmp.felk.cvut.cz \
    --cc=charvj10@fel.cvut.cz \
    --cc=fnu.vikram@xilinx.com \
    --cc=jan.kiszka@siemens.com \
    --cc=jasowang@redhat.com \
    --cc=jinyang.sia@gmail.com \
    --cc=jnovak@fel.cvut.cz \
    --cc=ningqiang1@huawei.com \
    --cc=ondrej.ille@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=socketcan@hartkopp.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).