From nobody Tue Feb 10 15:46:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1627496263; cv=none; d=zohomail.com; s=zohoarc; b=k04LPKz+8DPffntI6fHBC0fERVckni4q2E73AFxoVxF8hTIZZaofd2cmiu9Pvosch8z5ykB5xsbRy3WtcgzKFoUNWhB2d5z21/H1DVcYkmKqnteg/yFbmTtX6i22+fu7+53th5UKCA/A0/0ioZhiFT4gHuwhy8Giwb4BO21Kdl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627496263; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YwYKVHNgecu5jiIKoXnoWtjk/FNw2rOw7861LGYxMNs=; b=dSFHmAdYEcb6R3FSfTBT8vjxMacMEFY9BN9YXLTymdpyv5R/WwPo1KLs8x+6zSbcupDOQ/gQMBpgaMz0gJ5Sid/nDnG6TxKPY6Ryvk5VYsSCm0WDXoQMmXpahik2wrKnx3zpnFWeHPSw8CmCXYQqE2F1P89WL5l6i//cgGXosYE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1627496263549982.349379337772; Wed, 28 Jul 2021 11:17:43 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id j2so3646390wrx.9 for ; Wed, 28 Jul 2021 11:17:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id v5sm614199wrd.74.2021.07.28.11.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 11:17:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YwYKVHNgecu5jiIKoXnoWtjk/FNw2rOw7861LGYxMNs=; b=fy9J5xznGE0VLXw+HWBexvcNxEB0SuThh+YUPyuqh/X+TgrMej8Tz3M63H4ONwFB1u JYzurTtXN3lCT+/MPRvpbNjGnKccz3TbFZIpCkfDow4OM9goCMQxAoHvLXRZk7ZTH1bH LcVpTjbsBY6oxeAoq6BBWa0pjlKZR7Nn1TWQj4qiO+wqJL/UXmJZLr1sE/h/DdDgaXgG 0k2QersmTjfrYvfCDrqNPZDH1iozBuPQj+0m9YXl1bCV+za12sd9+4CaxcEb7d61aR+z tzQpnnddtwNQh5W/627bZiViwgyrwzJD4IvIPh0GEO4UEp3zzgq0SmpUPxPQhKYsaBK+ hvMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YwYKVHNgecu5jiIKoXnoWtjk/FNw2rOw7861LGYxMNs=; b=ges5jUhRQhzFja+DUCzRAk5yLtVJHkeiNcevCIatSToTIeODO1sV0+kCk5wg3tdJUI 8ZmNEpuGd9ZN+pOWw9+RqpXq5HhNttQigi5C6CzsKQ4+ob3G7rKddsN6ArFo39m8UQ3c ibSphSSOoE3J5/+FN2v1SNODW2IAHshXo8SeTz/bng7k1Hq7NuXI1UpNFpKpPGVX23xV tlNHKqrZVg9EJbLG8HG4lMxtQXo1qMdsscQ+7G4bjAfX1ISbjK65PB4d4aIKrbaCbzm7 6cl7QI0KylaEk8jdNwNVB5a5jjwIOpFTVMyI1bYQ947Z1VwcbwBM0D4gBrwiAcdT5jt9 dlMw== X-Gm-Message-State: AOAM532Tg5TXcewzgp1L/B9/dMddPmTEtITjQD7yp0lVCzeafSBZHtJc Rqgh0HNKb2ojKUnLPecyFRQ= X-Google-Smtp-Source: ABdhPJyZYmkpkyVUCqBdcQVKEoSji5VcnZDFm4a411qC3uQzfpzGwoJj7JuoSLL2P0xKIbUluKhIlg== X-Received: by 2002:adf:f1c6:: with SMTP id z6mr674996wro.207.1627496261720; Wed, 28 Jul 2021 11:17:41 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bin Meng , qemu-block@nongnu.org, qemu-arm@nongnu.org, Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-stable@nongnu.org Subject: [PATCH-for-6.1 2/3] hw/sd/sdcard: Fix assertion accessing out-of-range addresses with CMD30 Date: Wed, 28 Jul 2021 20:17:27 +0200 Message-Id: <20210728181728.2012952-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210728181728.2012952-1-f4bug@amsat.org> References: <20210728181728.2012952-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1627496264808100001 OSS-Fuzz found sending illegal addresses when querying the write protection bits triggers the assertion added in commit 84816fb63e5 ("hw/sd/sdcard: Assert if accessing an illegal group"): qemu-fuzz-i386-target-generic-fuzz-sdhci-v3: ../hw/sd/sd.c:824: uint32_t = sd_wpbits(SDState *, uint64_t): Assertion `wpnum < sd->wpgrps_size' failed. #3 0x7f62a8b22c91 in __assert_fail #4 0x5569adcec405 in sd_wpbits hw/sd/sd.c:824:9 #5 0x5569adce5f6d in sd_normal_command hw/sd/sd.c:1389:38 #6 0x5569adce3870 in sd_do_command hw/sd/sd.c:1737:17 #7 0x5569adcf1566 in sdbus_do_command hw/sd/core.c:100:16 #8 0x5569adcfc192 in sdhci_send_command hw/sd/sdhci.c:337:12 #9 0x5569adcfa3a3 in sdhci_write hw/sd/sdhci.c:1186:9 #10 0x5569adfb3447 in memory_region_write_accessor softmmu/memory.c:492:5 It is legal for the CMD30 to query for out-of-range addresses. Such invalid addresses are simply ignored in the response (write protection bits set to 0). Note, we had an off-by-one in the wpgrps_size check since commit a1bb27b1e98. Since we have a total of 'wpgrps_size' bits, the latest valid group bit is 'wpgrps_size - 1'. Since we now check the group bit is in range, remove the assertion. Include the qtest reproducer provided by Alexander Bulekov: $ make check-qtest-i386 ... Running test qtest-i386/fuzz-sdcard-test qemu-system-i386: ../hw/sd/sd.c:824: sd_wpbits: Assertion `wpnum < sd->wp= grps_size' failed. Cc: qemu-stable@nongnu.org Reported-by: OSS-Fuzz (Issue 29225) Resolves: https://gitlab.com/qemu-project/qemu/-/issues/495 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 4 ++-- tests/qtest/fuzz-sdcard-test.c | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 707dcc12a14..273af75c1be 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -820,8 +820,8 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr) =20 wpnum =3D sd_addr_to_wpnum(addr); =20 - for (i =3D 0; i < 32; i++, wpnum++, addr +=3D WPGROUP_SIZE) { - assert(wpnum < sd->wpgrps_size); + for (i =3D 0; i < 32 && wpnum < sd->wpgrps_size - 1; + i++, wpnum++, addr +=3D WPGROUP_SIZE) { if (addr >=3D sd->size) { /* * If the addresses of the last groups are outside the valid r= ange, diff --git a/tests/qtest/fuzz-sdcard-test.c b/tests/qtest/fuzz-sdcard-test.c index 96602eac7e5..ae14305344a 100644 --- a/tests/qtest/fuzz-sdcard-test.c +++ b/tests/qtest/fuzz-sdcard-test.c @@ -52,6 +52,41 @@ static void oss_fuzz_29225(void) qtest_quit(s); } =20 +/* + * https://gitlab.com/qemu-project/qemu/-/issues/495 + * Used to trigger: + * Assertion `wpnum < sd->wpgrps_size' failed. + */ +static void oss_fuzz_36217(void) +{ + QTestState *s; + + s =3D qtest_init(" -display none -m 32 -nodefaults -nographic" + " -device sdhci-pci,sd-spec-version=3D3 " + "-device sd-card,drive=3Dd0 " + "-drive if=3Dnone,index=3D0,file=3Dnull-co://,format=3D= raw,id=3Dd0"); + + qtest_outl(s, 0xcf8, 0x80001010); + qtest_outl(s, 0xcfc, 0xe0000000); + qtest_outl(s, 0xcf8, 0x80001004); + qtest_outw(s, 0xcfc, 0x02); + qtest_bufwrite(s, 0xe000002c, "\x05", 0x1); + qtest_bufwrite(s, 0xe000000f, "\x37", 0x1); + qtest_bufwrite(s, 0xe000000a, "\x01", 0x1); + qtest_bufwrite(s, 0xe000000f, "\x29", 0x1); + qtest_bufwrite(s, 0xe000000f, "\x02", 0x1); + qtest_bufwrite(s, 0xe000000f, "\x03", 0x1); + qtest_bufwrite(s, 0xe0000005, "\x01", 0x1); + qtest_bufwrite(s, 0xe000000f, "\x06", 0x1); + qtest_bufwrite(s, 0xe000000c, "\x05", 0x1); + qtest_bufwrite(s, 0xe000000e, "\x20", 0x1); + qtest_bufwrite(s, 0xe000000f, "\x08", 0x1); + qtest_bufwrite(s, 0xe000000b, "\x3d", 0x1); + qtest_bufwrite(s, 0xe000000f, "\x1e", 0x1); + + qtest_quit(s); +} + int main(int argc, char **argv) { const char *arch =3D qtest_get_arch(); @@ -60,6 +95,7 @@ int main(int argc, char **argv) =20 if (strcmp(arch, "i386") =3D=3D 0) { qtest_add_func("fuzz/sdcard/oss_fuzz_29225", oss_fuzz_29225); + qtest_add_func("fuzz/sdcard/oss_fuzz_36217", oss_fuzz_36217); } =20 return g_test_run(); --=20 2.31.1