From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93916C2B9F4 for ; Mon, 14 Jun 2021 12:12:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0293D611CE for ; Mon, 14 Jun 2021 12:12:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0293D611CE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lslSE-0004hB-UR for qemu-devel@archiver.kernel.org; Mon, 14 Jun 2021 08:12:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lslRc-0003xa-8M for qemu-devel@nongnu.org; Mon, 14 Jun 2021 08:11:56 -0400 Received: from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]:42496) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lslRa-0003iE-8c for qemu-devel@nongnu.org; Mon, 14 Jun 2021 08:11:55 -0400 Received: by mail-ot1-x334.google.com with SMTP id w23-20020a9d5a970000b02903d0ef989477so10554026oth.9 for ; Mon, 14 Jun 2021 05:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=WQZT6662ufv8t0LVurZCwgKcCIWgGcmJVkFoSgE8+6c=; b=ewWm94rEs5sn1/81cKQLhjX4gADlpHM/6bNJL+GwPZJnFOyn6sbVngCIhpSs723bCj zVr+/GXKUHPfu/Qwf1kckxQS2rNaDsnCKeiNNadqGPKl0VMOW6wA+fxZb3vvNYh/VZSc l+QAzTiPE6J3csdck67tr1dT70BeluFzXZicyaCX0FCP5Zav8h+65Y7L4GWUdQQG+zFu KmLjdDPVQoXnPXkPLCofI/3N14W9Os8Onu42repmhRQ/5jFUulCb8qiaHxatUXe6O92x dvpJGij++AobcnsX26d6FA79bQUqzkwGY6pNUwaU1uF/D/kkvORG0c+FTd2nrWrcN1eY B8Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=WQZT6662ufv8t0LVurZCwgKcCIWgGcmJVkFoSgE8+6c=; b=k6bbSsNuZkr76JijzUynoaeX/N534fzjz0Kp4JnRxivn9o7ulSJ83EVXm30RfXOYRK 56u1eUR8XGSI635Pt1BVPYq5hpTawzxJoxYZKgTbnpOwEkVIuhHnVQvsiDH/7xxN0wQv CMF8KUTzLYkUv/46fqnmx78ogWqk8wQLEVQHEmFwjCyryx3yHEOzRKbuYUENA6MIu40n NzlWnuTvd20lcE5jG/aAmCblIblGD//nwOcy/P1dNEjBOXYWVRrivzdM+CGT9QHXal55 Tcsp9KjMWenCqRMb+Pq1Xw4KynBs3bZTbma3Doi1AuFo4hkBGe8liAF+slD8gM8qTTAP oNJA== X-Gm-Message-State: AOAM532Kv1XarG3KtQObDavt8oDrJ82YBra6K59+Ne46agXRul/Ujeir /FX+250BGkDuZV/7+SKOUEhSJq8WGIEUO7c0kts= X-Google-Smtp-Source: ABdhPJx5/yUr6+Imsn4zHFi5ctULuJe7vWRyEzICvY56DajpRidFIh0pF7R8s8dTc+GnTfXTfdeOdoOonj6qpbfCt8w= X-Received: by 2002:a9d:3e5:: with SMTP id f92mr12988170otf.181.1623672712890; Mon, 14 Jun 2021 05:11:52 -0700 (PDT) MIME-Version: 1.0 References: <20210601151813.2059996-1-f4bug@amsat.org> In-Reply-To: From: Qiang Liu Date: Mon, 14 Jun 2021 20:11:41 +0800 Message-ID: Subject: Re: [PATCH] hw/audio/sb16: Avoid assertion by restricting I/O sampling rate range To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::334; envelope-from=cyruscyliu@gmail.com; helo=mail-ot1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Bulekov , qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Phil, Thanks for inviting me. I've applied your patch. It seems fine because my sb16 fuzzer is running for another 24 hours and it has no crash yet. I can also double-check the specification. Best, Qiang On Mon, Jun 14, 2021 at 7:13 PM Philippe Mathieu-Daud=C3=A9 wrote: > > ping? > > On 6/1/21 5:18 PM, Philippe Mathieu-Daud=C3=A9 wrote: > > While the SB16 seems to work up to 48000 Hz, the "Sound Blaster Series > > Hardware Programming Guide" limit the sampling range from 4000 Hz to > > 44100 Hz (Section 3-9, 3-10: Digitized Sound I/O Programming, tables > > 3-2 and 3-3). > > > > Later, section 6-15 (DSP Commands) is more specific regarding the 41h / > > 42h registers (Set digitized sound output sampling rate): > > > > Valid sampling rates range from 5000 to 45000 Hz inclusive. > > > > There is no comment regarding error handling if the register is filled > > with an out-of-range value. (See also section 3-28 "8-bit or 16-bit > > Auto-initialize Transfer"). Assume limits are enforced in hardware. > > > > This fixes triggering an assertion in audio_calloc(): > > > > #1 abort > > #2 audio_bug audio/audio.c:119:9 > > #3 audio_calloc audio/audio.c:154:9 > > #4 audio_pcm_sw_alloc_resources_out audio/audio_template.h:116:15 > > #5 audio_pcm_sw_init_out audio/audio_template.h:175:11 > > #6 audio_pcm_create_voice_pair_out audio/audio_template.h:410:9 > > #7 AUD_open_out audio/audio_template.h:503:14 > > #8 continue_dma8 hw/audio/sb16.c:216:20 > > #9 dma_cmd8 hw/audio/sb16.c:276:5 > > #10 command hw/audio/sb16.c:0 > > #11 dsp_write hw/audio/sb16.c:949:13 > > #12 portio_write softmmu/ioport.c:205:13 > > #13 memory_region_write_accessor softmmu/memory.c:491:5 > > #14 access_with_adjusted_size softmmu/memory.c:552:18 > > #15 memory_region_dispatch_write softmmu/memory.c:0:13 > > #16 flatview_write_continue softmmu/physmem.c:2759:23 > > #17 flatview_write softmmu/physmem.c:2799:14 > > #18 address_space_write softmmu/physmem.c:2891:18 > > #19 cpu_outw softmmu/ioport.c:70:5 > > > > [*] http://www.baudline.com/solutions/full_duplex/sb16_pci/index.html > > > > Fixes: 85571bc7415 ("audio merge (malc)") > > Buglink: https://bugs.launchpad.net/bugs/1910603 > > OSS-Fuzz Report: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id= =3D29174 > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > > --- > > hw/audio/sb16.c | 14 ++++++++++ > > tests/qtest/fuzz-sb16-test.c | 52 ++++++++++++++++++++++++++++++++++++ > > MAINTAINERS | 1 + > > tests/qtest/meson.build | 1 + > > 4 files changed, 68 insertions(+) > > create mode 100644 tests/qtest/fuzz-sb16-test.c > > > > diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c > > index 8b207004102..5cf121fe363 100644 > > --- a/hw/audio/sb16.c > > +++ b/hw/audio/sb16.c > > @@ -115,6 +115,9 @@ struct SB16State { > > PortioList portio_list; > > }; > > > > +#define SAMPLE_RATE_MIN 5000 > > +#define SAMPLE_RATE_MAX 45000 > > + > > static void SB_audio_callback (void *opaque, int free); > > > > static int magic_of_irq (int irq) > > @@ -241,6 +244,17 @@ static void dma_cmd8 (SB16State *s, int mask, int = dma_len) > > int tmp =3D (256 - s->time_const); > > s->freq =3D (1000000 + (tmp / 2)) / tmp; > > } > > + if (s->freq < SAMPLE_RATE_MIN) { > > + qemu_log_mask(LOG_GUEST_ERROR, > > + "sampling range too low: %d, increasing to %u\n"= , > > + s->freq, SAMPLE_RATE_MIN); > > + s->freq =3D SAMPLE_RATE_MIN; > > + } else if (s->freq > SAMPLE_RATE_MAX) { > > + qemu_log_mask(LOG_GUEST_ERROR, > > + "sampling range too high: %d, decreasing to %u\n= ", > > + s->freq, SAMPLE_RATE_MAX); > > + s->freq =3D SAMPLE_RATE_MAX; > > + } > > > > if (dma_len !=3D -1) { > > s->block_size =3D dma_len << s->fmt_stereo; > > diff --git a/tests/qtest/fuzz-sb16-test.c b/tests/qtest/fuzz-sb16-test.= c > > new file mode 100644 > > index 00000000000..51030cd7dc4 > > --- /dev/null > > +++ b/tests/qtest/fuzz-sb16-test.c > > @@ -0,0 +1,52 @@ > > +/* > > + * QTest fuzzer-generated testcase for sb16 audio device > > + * > > + * Copyright (c) 2021 Philippe Mathieu-Daud=C3=A9 > > + * > > + * SPDX-License-Identifier: GPL-2.0-or-later > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "libqos/libqtest.h" > > + > > +/* > > + * This used to trigger the assert in audio_calloc > > + * https://bugs.launchpad.net/qemu/+bug/1910603 > > + */ > > +static void test_fuzz_sb16_0x1c(void) > > +{ > > + QTestState *s =3D qtest_init("-M q35 -display none " > > + "-device sb16,audiodev=3Dsnd0 " > > + "-audiodev none,id=3Dsnd0"); > > + qtest_outw(s, 0x22c, 0x41); > > + qtest_outb(s, 0x22c, 0x00); > > + qtest_outw(s, 0x22c, 0x1004); > > + qtest_outw(s, 0x22c, 0x001c); > > + qtest_quit(s); > > +} > > + > > +static void test_fuzz_sb16_0x91(void) > > +{ > > + QTestState *s =3D qtest_init("-M pc -display none " > > + "-device sb16,audiodev=3Dnone " > > + "-audiodev id=3Dnone,driver=3Dnone"); > > + qtest_outw(s, 0x22c, 0xf141); > > + qtest_outb(s, 0x22c, 0x00); > > + qtest_outb(s, 0x22c, 0x24); > > + qtest_outb(s, 0x22c, 0x91); > > + qtest_quit(s); > > +} > > + > > +int main(int argc, char **argv) > > +{ > > + const char *arch =3D qtest_get_arch(); > > + > > + g_test_init(&argc, &argv, NULL); > > + > > + if (strcmp(arch, "i386") =3D=3D 0) { > > + qtest_add_func("fuzz/test_fuzz_sb16/1c", test_fuzz_sb16_0x1c); > > + qtest_add_func("fuzz/test_fuzz_sb16/91", test_fuzz_sb16_0x91); > > + } > > + > > + return g_test_run(); > > +} > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 5f55404f2fa..7edb26d2293 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -2213,6 +2213,7 @@ F: qapi/audio.json > > F: tests/qtest/ac97-test.c > > F: tests/qtest/es1370-test.c > > F: tests/qtest/intel-hda-test.c > > +F: tests/qtest/fuzz-sb16-test.c > > > > Block layer core > > M: Kevin Wolf > > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > > index c3a223a83d6..b03e8541700 100644 > > --- a/tests/qtest/meson.build > > +++ b/tests/qtest/meson.build > > @@ -20,6 +20,7 @@ > > qtests_generic =3D \ > > (config_all_devices.has_key('CONFIG_MEGASAS_SCSI_PCI') ? ['fuzz-mega= sas-test'] : []) + \ > > (config_all_devices.has_key('CONFIG_VIRTIO_SCSI') ? ['fuzz-virtio-sc= si-test'] : []) + \ > > + (config_all_devices.has_key('CONFIG_SB16') ? ['fuzz-sb16-test'] : []= ) + \ > > [ > > 'cdrom-test', > > 'device-introspect-test', > >