From nobody Wed Oct 29 22:59:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525838474286226.35325054862562; Tue, 8 May 2018 21:01:14 -0700 (PDT) Received: from localhost ([::1]:54347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGGHx-0000wj-JR for importer@patchew.org; Wed, 09 May 2018 00:01:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGG50-0004nn-0o for qemu-devel@nongnu.org; Tue, 08 May 2018 23:47:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGG4z-0003T6-23 for qemu-devel@nongnu.org; Tue, 08 May 2018 23:47:50 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:39794) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGG4y-0003SY-TG for qemu-devel@nongnu.org; Tue, 08 May 2018 23:47:48 -0400 Received: by mail-qt0-x243.google.com with SMTP id f1-v6so43975283qtj.6 for ; Tue, 08 May 2018 20:47:48 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id w12-v6sm14497002qtb.80.2018.05.08.20.47.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 20:47:47 -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=jQ1k9e3GzZnNGYAuzgZd3miVz6tH90Mw04lttRBtRdY=; b=FLSmFHTG+jFqjW6yKzHV5R5e46LyStOprJ4y56tFxYu3aYU7fyI+jeAMJ9gxTUmnHv X3xW5YuMGM37C0H+Ik63z0h4CKBA1XqbQnZ/U3wVhUKpmD43JC7bh89HSinPeYtp9Md6 NijZKuENNAKnYPs+1fo9He6N/iux4KPuWKh+jlehA+YSK4EIB0AeZ4UBe9H14mVbENXP tVp0EUCL9sEesZ+D59cMy/wF2pGsRycWi/FlPbBgwHvgG3rWdmZd9Q2D3RzhA6DN84Aa H+ifhgQGpr9Qpqro1dhY+ZUynPQiBbUVbjyVpvHKsnfksAhhG7Z23dq3jXQvPWAy+Gle afQQ== 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=jQ1k9e3GzZnNGYAuzgZd3miVz6tH90Mw04lttRBtRdY=; b=omSbU6GMOjl1Duwz1rHIquo/2WlCOADBiBSBsb73+e+y2m074clt9sOSbH0E6W2E/X VxA6v9HgYW3M+tjC5GDsJxiAcX0oxqhGmRh6D2SdUvkct0zZMFFZnQU4kK+DfjNDAHAB z5aff6Uth6iBDerubtDo/NU4ef4Rm4cvTc7XSuOaueKliM3Xa/8PHT0bwqYqZiCBSRGJ nkwZ+Y6qltKeEjSt0FSl3zC5N+i/YLbKqWP4C1jbouXHc43OiKARCAM62oshU5vSKtV+ f/kBY8b0eGPS4db40QvalCDpTo6d/dpLW3AibblZk21q7hs+AoM3vkvAeDg5ggpPK/gl OfFw== X-Gm-Message-State: ALQs6tBgpvFGEr39XORohGj7G8QRUCh8ZN8LKpDjuGE+FIixZtlEqSwB kcrf4ddw+aMZyIf9UHMrvQI= X-Google-Smtp-Source: AB8JxZoSphgqxOQLhw33kbw3WpZvsuW+HOBCsoVg/fBY4+ni/5wFGgFv5FYxq3FzRSJIAx66CWvTEA== X-Received: by 2002:ac8:376b:: with SMTP id p40-v6mr41583506qtb.282.1525837668250; Tue, 08 May 2018 20:47:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , "Edgar E . Iglesias" Date: Wed, 9 May 2018 00:46:57 -0300 Message-Id: <20180509034658.26455-14-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509034658.26455-1-f4bug@amsat.org> References: <20180509034658.26455-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 13/14] sdcard: Add a "validate-crc" property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Michael Walle , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Since not all modelled controllers use the CRC verification (which is somehow expensive), let the controller have a configurable property to enable verification. So far only the Milkymist controller uses it. This silent the Coverity warning: "Code block is unreachable because of the syntactic structure of the code= (CWE-561)" and fixes the following issue: - CID1005332 (hw/sd/sd.c::sd_req_crc_validate) Structurally dead code Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Michael Walle --- hw/sd/milkymist-memcard.c | 1 + hw/sd/sd.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index 94bb1ffc6f..f7b6d3b140 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -273,6 +273,7 @@ static void milkymist_memcard_realize(DeviceState *dev,= Error **errp) blk =3D dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; carddev =3D qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); qdev_prop_set_drive(carddev, "drive", blk, &err); + object_property_set_bool(OBJECT(carddev), true, "validate-crc", &err); object_property_set_bool(OBJECT(carddev), true, "realized", &err); if (err) { error_setg(errp, "failed to init SD card: %s", error_get_pretty(er= r)); diff --git a/hw/sd/sd.c b/hw/sd/sd.c index aaf3a6806a..0170eb832b 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -93,6 +93,7 @@ struct SDState { /* Configurable properties */ BlockBackend *blk; bool spi; + bool validate_crc; =20 uint32_t mode; /* current card mode, one of SDCardModes */ int32_t state; /* current card state, one of SDCardStates */ @@ -467,10 +468,12 @@ static void sd_set_sdstatus(SDState *sd) memset(sd->sd_status, 0, 64); } =20 -static bool sd_req_crc_is_valid(const void *buffer) +static bool sd_req_crc_is_valid(SDState *sd, const void *request) { + if (sd->validate_crc) { + return sd_frame48_verify_checksum(request); + } return true; - return sd_frame48_verify_checksum(buffer); /* TODO */ } =20 static void sd_response_r1_make(SDState *sd, uint8_t *response) @@ -1631,7 +1634,7 @@ int sd_do_command(SDState *sd, const uint8_t *request, cmd =3D request[0]; arg =3D ldl_be_p(&request[1]); =20 - if (!sd_req_crc_is_valid(request)) { + if (!sd_req_crc_is_valid(sd, request)) { sd->card_status |=3D COM_CRC_ERROR; rtype =3D sd_illegal; goto send_response; @@ -2079,6 +2082,7 @@ static Property sd_properties[] =3D { * board to ensure that ssi transfers only occur when the chip select * is asserted. */ DEFINE_PROP_BOOL("spi", SDState, spi, false), + DEFINE_PROP_BOOL("validate-crc", SDState, validate_crc, false), DEFINE_PROP_END_OF_LIST() }; =20 --=20 2.17.0