From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Pavel Pisa <pisa@cmp.felk.cvut.cz>,
Paolo Bonzini <pbonzini@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Qiang Ning <ningqiang1@huawei.com>
Cc: Vikram Garhwal <fnu.vikram@xilinx.com>,
Darren Kenny <darren.kenny@oracle.com>,
Alexander Bulekov <alxndr@bu.edu>,
qemu-devel@nongnu.org,
Francisco Iglesias <francisco.iglesias@xilinx.com>,
Bandan Das <bsd@redhat.com>
Subject: Re: [PATCH-for-6.1] hw/net/can: sja1000 fix buff2frame_bas for dlc out of std CAN 8 bytes
Date: Thu, 29 Jul 2021 12:03:00 +0200 [thread overview]
Message-ID: <2a962eb1-8cd2-dcec-7b23-46f0fa93903f@redhat.com> (raw)
In-Reply-To: <202107291119.33951.pisa@cmp.felk.cvut.cz>
Cc'ing QEMU fuzz team.
On 7/29/21 11:19 AM, Pavel Pisa wrote:
> Hello everybody,
>
> please, can somebody accept the fix for master?
> It should be ideally applied even to stable
> branches.
>
> Or should I send request through some other form
> then on the list?
I suppose the patch fell through the cracks.
Apparently Paolo doesn't like to queue fuzzer fixes without
reproducer. For examples see tests/qtest/fuzz-*.c in the tree.
>
> Thanks,
>
> Pavel
>
> On Monday 26 of July 2021 18:24:58 Pavel Pisa wrote:
>> 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).
>>
If you want the patch backported in stable releases, please
include:
Cc: qemu-stable@nongnu.org
>> 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;
>> + }
>> +
This doesn't seem a complete fix (see buff2frame_pel).
Here can_dlc shouldn't be more than 8.
What you can do here (and in buff2frame_pel) is:
assert(frame->can_dlc <= 8);
and find where the field is abused, probably discarding
invalid frames earlier?
>> for (i = 0; i < frame->can_dlc; i++) {
>> frame->data[i] = buff[2 + i];
>> }
next prev parent reply other threads:[~2021-07-29 10:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-26 16:24 [PATCH] hw/net/can: sja1000 fix buff2frame_bas for dlc out of std CAN 8 bytes Pavel Pisa
2021-07-29 9:19 ` Pavel Pisa
2021-07-29 10:03 ` Philippe Mathieu-Daudé [this message]
2021-07-29 11:52 ` [PATCH-for-6.1] " 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=2a962eb1-8cd2-dcec-7b23-46f0fa93903f@redhat.com \
--to=philmd@redhat.com \
--cc=alxndr@bu.edu \
--cc=bsd@redhat.com \
--cc=darren.kenny@oracle.com \
--cc=fnu.vikram@xilinx.com \
--cc=francisco.iglesias@xilinx.com \
--cc=jasowang@redhat.com \
--cc=ningqiang1@huawei.com \
--cc=pbonzini@redhat.com \
--cc=pisa@cmp.felk.cvut.cz \
--cc=qemu-devel@nongnu.org \
/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).