From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Wed, 13 Dec 2017 20:20:14 -0300 Message-Id: <20171213232025.24503-16-f4bug@amsat.org> 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: 8bit Subject: [Qemu-devel] [PATCH 15/26] sdcard: use PW_LEN define instead of '16' magic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrew Baumann , Prasad J Pandit , Clement Deschamps Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Peter Crosthwaite , Sai Pavan Boddu Signed-off-by: Philippe Mathieu-Daudé --- 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 */ +#define PW_LEN 16 + typedef enum { sd_r0 = 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]; @@ -571,7 +573,7 @@ static const VMStateDescription sd_vmstate = { 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) if (sd->blk_len < 2 + pwd_len || pwd_len <= sd->pwd_len || - pwd_len > sd->pwd_len + 16) { + pwd_len > sd->pwd_len + sizeof(sd->pwd)) { sd->card_status |= LOCK_UNLOCK_FAILED; return; } -- 2.15.1