From nobody Tue Feb 10 01:35:40 2026 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513207796885360.9326870901101; Wed, 13 Dec 2017 15:29:56 -0800 (PST) Received: from localhost ([::1]:38267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGTB-00036T-UR for importer@patchew.org; Wed, 13 Dec 2017 18:29:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGMX-00061L-JO for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePGMW-0008JP-H4 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:53 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:44703) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePGMW-0008J0-DJ for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:22:52 -0500 Received: by mail-qt0-x242.google.com with SMTP id m59so5832588qte.11 for ; Wed, 13 Dec 2017 15:22:52 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id l1sm1666918qkk.74.2017.12.13.15.22.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 15:22:51 -0800 (PST) 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=76Vd//NOS6V/WyUxeRWjjnWWrxazhDkGbMhRrH2B2xg=; b=Nu69qDTe9kLZEHh1fqFdVZ/c1hbDPlRicE+NUbHgh63I9bxN0ILYfJdpH6qS2YE6Sx /GGx4gxiGeixuRwq9cy9hWArXqsB9Pq37MgMElLdRrTT/RGPRz1Prypc3KW4kl7dzSQq Y0L9TWoqSgoPs07ece6cVjcRfOVbH5dIYdeStJ+z027knGFkvXFrBJtnXrRUOKXhpyVB yL3ca7AGn7lIVOyNlS88ONfTRwlDhrz2UiVnEt/qZ3Ulu/D2ffh7N5Fc9uknul57u60K tbPx+QiPIdRboJApKvn85CxChwPEOAOvuE1R08CQJmKl1O1KgC3sMHox4vtT07GXlwMW Myyw== 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=76Vd//NOS6V/WyUxeRWjjnWWrxazhDkGbMhRrH2B2xg=; b=pEHwW8xEzJdc2WAyuEa14oCjFMCKQhnX5Y9tXHJDN/R1G1ABD8M5xxw3WxfdxJfGbS 8ChlDf5lVcy+BGpH2LgVuDH+Ujex89/N0SLUhkB2asc3avlhGK3AC1bpTChEEgYFEoV+ L4m0w2yCHec/vjknYTp0Z0ZiMUXH6fzCQ165gBCotE13IQFyNUuF2CO9U+nz8KqU/GSp CX4sdHowMebSN2mXLG5JWnOBcs+2T0mSF5u77p5Y2wUMH2xmS+bExJG/x5o2daq9bkfh StVePLLwBxC3tQv/LwfTFb3hYmMiwGBqPbYCShBMiVRkCRVXcFdsb0q2wxFX882WzP/P pwEQ== X-Gm-Message-State: AKGB3mKYoH1Z/xXmqBcXP2eCzZUTqMjV5PmH7igIMW6+AblZDmWu1MXT eRFFtCFJ9Sju7Jp3AHsx3PE= X-Google-Smtp-Source: ACJfBotIkiQrQevtj4W8Ej4b0A9AibJCVai146wIyplss9PXAOCYpvozAsd7kyKLtNtQ9qchi/Y4ZQ== X-Received: by 10.200.22.91 with SMTP id x27mr13392636qtk.226.1513207371975; Wed, 13 Dec 2017 15:22:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrew Baumann , Prasad J Pandit , Clement Deschamps Date: Wed, 13 Dec 2017 20:20:14 -0300 Message-Id: <20171213232025.24503-16-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213232025.24503-1-f4bug@amsat.org> References: <20171213232025.24503-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::242 Subject: [Qemu-devel] [PATCH 15/26] sdcard: use PW_LEN define instead of '16' magic 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: Sai Pavan Boddu , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 2a249b1612..542170c3ec 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -47,6 +47,8 @@ #define OCR_POWER_UP 0x80000000 #define OCR_POWER_DELAY_NS 500000 /* 0.5ms */ =20 +#define PW_LEN 16 + typedef enum { sd_r0 =3D 0, /* no response */ sd_r1, /* normal response command */ @@ -100,7 +102,7 @@ struct SDState { uint32_t multi_blk_cnt; uint32_t erase_start; uint32_t erase_end; - uint8_t pwd[16]; + uint8_t pwd[PW_LEN]; uint32_t pwd_len; uint8_t function_group[6]; =20 @@ -571,7 +573,7 @@ static const VMStateDescription sd_vmstate =3D { VMSTATE_UINT32(multi_blk_cnt, SDState), VMSTATE_UINT32(erase_start, SDState), VMSTATE_UINT32(erase_end, SDState), - VMSTATE_UINT8_ARRAY(pwd, SDState, 16), + VMSTATE_UINT8_ARRAY(pwd, SDState, PW_LEN), VMSTATE_UINT32(pwd_len, SDState), VMSTATE_UINT8_ARRAY(function_group, SDState, 6), VMSTATE_UINT8(current_cmd, SDState), @@ -733,7 +735,7 @@ static void sd_lock_command(SDState *sd) =20 if (sd->blk_len < 2 + pwd_len || pwd_len <=3D sd->pwd_len || - pwd_len > sd->pwd_len + 16) { + pwd_len > sd->pwd_len + sizeof(sd->pwd)) { sd->card_status |=3D LOCK_UNLOCK_FAILED; return; } --=20 2.15.1