From nobody Thu May 16 21:04:21 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1591208538; cv=none; d=zohomail.com; s=zohoarc; b=bzZo3+ohcq9g7SfY8MCKyAcSUHkWGOeoHM7396vSnc81gNCvGMMvivL06wOlbE/wIM11m2FPEVKWkx5Z4csaaDLzMphcIA6gam68J4ZXWtN1iElHP+qvnRdQ9ttGRRx+7MoPzdYjNOWhgAbo0+efxXmFZgdJqZFT3t2ZHBvLjb8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591208538; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=UpblTYIb7jLLVBKdbKT6mj2ST1AGYG3e2qmSQnP4jGQ=; b=iTYCV5jFrDnvs2J78cZ8xcjGbwE65PsZs5RPQZYPrDRzWpQpUG3v9wJS5NOeKb9224Krt14GKpbmf2mktPq7VT1G/K2ESLWu+qJQt0g2F/tC7YwxcssMfaC7hSoKaV4ns6uejsUy3SCTrGXQEJ7iej7e+MWZ9lALUhSypj+oLwI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591208538241103.41058132651483; Wed, 3 Jun 2020 11:22:18 -0700 (PDT) Received: from localhost ([::1]:48454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgY1o-0002KF-Jq for importer@patchew.org; Wed, 03 Jun 2020 14:22:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgY0x-0001qJ-Tl for qemu-devel@nongnu.org; Wed, 03 Jun 2020 14:21:24 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jgY0x-0003KU-9o for qemu-devel@nongnu.org; Wed, 03 Jun 2020 14:21:23 -0400 Received: by mail-wr1-x441.google.com with SMTP id j10so3398292wrw.8 for ; Wed, 03 Jun 2020 11:21:22 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id t7sm4668907wrq.41.2020.06.03.11.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 11:21:20 -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:mime-version :content-transfer-encoding; bh=UpblTYIb7jLLVBKdbKT6mj2ST1AGYG3e2qmSQnP4jGQ=; b=USbkfOTJyr/Ves5Ezguef/w9N7vq7vKFlv+YuV10kWTRJiRHydiQwoc+bmQgRLp8az 8q4LpDSoYDYQ/Vewgyzb97H+HwRM4nXL2QSOHK9eXFpxibSPTJIUmBMrbT+WiDEEnHVH NkZJ4GPk0YvtwwFPPb3+/S3KhKE8peDB1LXliY+FdvBorTB9s4kOhkwwR2uWmABIDcx+ bRHGMKcWWzXvDaXu1BwCgYIRKrCdXyTpUDiF6R76nE4UCOGSm+hWni0Kji4CoavbXibQ XF/YB0tCfw8aVhDjAnUCqKHTkp6g0SRNXlMBRNzQNBv8dMzH/dx/TdxbRn8Y6iwPidFz VC5g== 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 :mime-version:content-transfer-encoding; bh=UpblTYIb7jLLVBKdbKT6mj2ST1AGYG3e2qmSQnP4jGQ=; b=WbUPYEI4cuXIER+87sRlfHsyG5gJFngGAPJpkKuxHnpzNA4vIKr1x0Ch+Dg9W+6she 0EZiJul4dpqxeBksl5kyHtJ2G4uubwep01OIld+Gxcc0X7aztfouL2vyKXQxc9V9TdeY 9hWNy6lcu5W+uePcA4Zk5zwzMSUQVxsLX/Umqk99xESJ89jPJ6DrWtPwvcTbIJnwxXvZ rLyMpmbOtACSAStTqfmmdAWyJ0KpdhvoqOOQrWIh1o4kWnzkhqm2zlNQmvFUf6fVMP4E KAviLmvMwU2kRvBY7aAWE7Cl8sUDO+xdzms7ee3GSvgwbibonVEcwkYJzWCJJTqCJoMS I5ig== X-Gm-Message-State: AOAM5335nmtcl+Z3o42CimUk/wTKYDFndlwFtRoTe2kr4e1Hci1pqnX+ cEO03B3q3cB5YmpBxD2xU8oSyk+u X-Google-Smtp-Source: ABdhPJwaKJT9Zjt5yilna8gcb8ueKrpTbMb7HBZEeB8Qwd0POF+LEqr+MSZSSI/gmpKoibcsMbJ6+Q== X-Received: by 2002:adf:cd08:: with SMTP id w8mr696916wrm.36.1591208481092; Wed, 03 Jun 2020 11:21:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] hw/sd/sdcard: Restrict Class 6 commands to SCSD cards Date: Wed, 3 Jun 2020 20:21:18 +0200 Message-Id: <20200603182118.14216-1-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Prasad J Pandit , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexander Bulekov , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Only SCSD cards support Class 6 (Block Oriented Write Protection) commands. "SD Specifications Part 1 Physical Layer Simplified Spec. v3.01" 4.3.14 Command Functional Difference in Card Capacity Types * Write Protected Group SDHC and SDXC do not support write-protected groups. Issuing CMD28, CMD29 and CMD30 generates the ILLEGAL_COMMAND error. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- This patch doesn't fix CVE-2020-13253, but greatly reduce QEMU exposure to it. https://bugs.launchpad.net/qemu/+bug/1880822 --- hw/sd/sd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 3c06a0ac6d..da39590f58 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -905,6 +905,11 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SD= Request req) sd->multi_blk_cnt =3D 0; } =20 + if (sd_cmd_class[req.cmd] =3D=3D 6 && FIELD_EX32(sd->ocr, OCR, CARD_CA= PACITY)) { + /* Only Standard Capacity cards support class 6 commands */ + return sd_illegal; + } + switch (req.cmd) { /* Basic commands (Class 0 and Class 1) */ case 0: /* CMD0: GO_IDLE_STATE */ --=20 2.21.3