From patchwork Wed Jan 20 18:50:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 8073601 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D29D4BEEE5 for ; Wed, 20 Jan 2016 18:51:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 06FF720504 for ; Wed, 20 Jan 2016 18:51:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2C42F204FC for ; Wed, 20 Jan 2016 18:51:16 +0000 (UTC) Received: from localhost ([::1]:44677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLxqd-0007k2-MJ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 20 Jan 2016 13:51:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLxqW-0007jW-4y for qemu-devel@nongnu.org; Wed, 20 Jan 2016 13:51:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLxqR-0007A1-Np for qemu-devel@nongnu.org; Wed, 20 Jan 2016 13:51:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLxqR-00079x-IV for qemu-devel@nongnu.org; Wed, 20 Jan 2016 13:51:03 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 245DABAEDC; Wed, 20 Jan 2016 18:51:03 +0000 (UTC) Received: from javelin.localdomain (vpn-225-56.phx2.redhat.com [10.3.225.56]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0KIowxM007945 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 20 Jan 2016 13:51:00 -0500 From: P J P To: qemu-devel@nongnu.org Date: Thu, 21 Jan 2016 00:20:57 +0530 Message-Id: <1453315857-1352-1-git-send-email-ppandit@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Qinghao Tang , Peter Maydell , Prasad J Pandit Subject: [Qemu-devel] [PATCH v2] sd: limit 'req.cmd' while using as an array index X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Prasad J Pandit While processing standard SD commands, the 'req.cmd' value could lead to OOB read when used as an index into 'sd_cmd_type' or 'sd_cmd_class' arrays. Limit 'req.cmd' value to avoid such an access. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit Reviewed-by: Peter Maydell --- hw/sd/sd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) Update as per review: -> https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg03769.html diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 1a9935c..5ee3e54 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -668,8 +668,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, /* Not interpreting this as an app command */ sd->card_status &= ~APP_CMD; - if (sd_cmd_type[req.cmd] == sd_ac || sd_cmd_type[req.cmd] == sd_adtc) + if (sd_cmd_type[req.cmd & 0x3F] == sd_ac + || sd_cmd_type[req.cmd & 0x3F] == sd_adtc) { rca = req.arg >> 16; + } DPRINTF("CMD%d 0x%08x state %d\n", req.cmd, req.arg, sd->state); switch (req.cmd) { @@ -1340,7 +1342,8 @@ static int cmd_valid_while_locked(SDState *sd, SDRequest *req) if (req->cmd == 16 || req->cmd == 55) { return 1; } - return sd_cmd_class[req->cmd] == 0 || sd_cmd_class[req->cmd] == 7; + return sd_cmd_class[req->cmd & 0x3F] == 0 + || sd_cmd_class[req->cmd & 0x3F] == 7; } int sd_do_command(SDState *sd, SDRequest *req,