From patchwork Mon Nov 13 14:11:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 118764 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1844291qgn; Mon, 13 Nov 2017 06:14:18 -0800 (PST) X-Google-Smtp-Source: AGs4zMbXd0/pmf72bCea0cDCJiuWkF/vuhvchknVe1MT8RmzEWiTunnQxMkRkNe2RJDPFO485Pmx X-Received: by 10.37.48.8 with SMTP id w8mr5918773ybw.520.1510582458222; Mon, 13 Nov 2017 06:14:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510582458; cv=none; d=google.com; s=arc-20160816; b=z1LuswtWpzPyWMIVuAIwVsh8TOopyxvZSYuGwyL4m83wO4LnoDAxe2hF+cGtB81RQC YZfO2mPA8LInAowytUJjWM1r7ujyV+Ee8zU43FakQKUORz4zHHqZ1u8Zu+cSdpwteKS/ lSwX16RCPpd32aKviw/bn3Mveun/8IrwSVek5APPy8TdDxu7Nb/j5CNixmfSp7v8TEbx 6wSrIFCv6aGH12AfG7b9L9Vsnvl3EPJd+qRdcItoBJaHoxnj8oVPLSlKwiEvv3xexpNI igfJtPHt5awWBXYKdIy391hH/xFq+CKmHHexIQFutfC1Mc55S/FLS9WOjrigfVJFXt/h hZkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=anR6PthChcXK1NpVTFpo0qHrc8xNahdhAYOwI3oUIWc=; b=JeLnFyJVjw0djKwtDKWb+tiOaampXs2x4iUld+HmkRLT4v7K6eB2ak2/JrLb83y/bV JePbowurpPv9q6L3OgWgkn9l0FNBhNf62B/v/JPiC/Bpvz4EYp1s+YO/4LEhN+cnhrsH BMn8y1e2yf3w3AuKOpaM9hiTsaYRBYuGFQce7UT0d9YOBHupF8SaX8ivx99M0pEFZQ69 Bp6HoaF/aWoqMl1E6wb0i9PWJzrR/SR9E8IW6kc/Az8nGh0S4O21/COxCy9Cqu3UFy4d g9jf8ywhktFE99DSsgf4xCMs4lMUOWNNq0ZIiJE7Fhk6p3+wAJ1Vpjas7NxKCODQ8m4X TNDw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f62si3490777ybb.55.2017.11.13.06.14.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 13 Nov 2017 06:14:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEFVB-00070L-LE for patch@linaro.org; Mon, 13 Nov 2017 09:14:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEFSL-0004A6-Q8 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 09:11:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEFSH-0007jt-Jc for qemu-devel@nongnu.org; Mon, 13 Nov 2017 09:11:21 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:38322) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eEFSH-0007Yd-CW for qemu-devel@nongnu.org; Mon, 13 Nov 2017 09:11:17 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1eEFS3-00022S-MZ for qemu-devel@nongnu.org; Mon, 13 Nov 2017 14:11:03 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 13 Nov 2017 14:11:37 +0000 Message-Id: <1510582304-27058-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510582304-27058-1-git-send-email-peter.maydell@linaro.org> References: <1510582304-27058-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 2/9] highbank: validate register offset before access 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Prasad J Pandit An 'offset' parameter sent to highbank register r/w functions could be greater than number(NUM_REGS=0x200) of hb registers, leading to an OOB access issue. Add check to avoid it. Reported-by: Moguofang (Dennis mo) Signed-off-by: Prasad J Pandit Message-id: 20171113062658.9697-1-ppandit@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/highbank.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 354c6b2..287392b 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -34,6 +34,7 @@ #include "hw/ide/ahci.h" #include "hw/cpu/a9mpcore.h" #include "hw/cpu/a15mpcore.h" +#include "qemu/log.h" #define SMP_BOOT_ADDR 0x100 #define SMP_BOOT_REG 0x40 @@ -117,14 +118,26 @@ static void hb_regs_write(void *opaque, hwaddr offset, } } - regs[offset/4] = value; + if (offset / 4 >= NUM_REGS) { + qemu_log_mask(LOG_GUEST_ERROR, + "highbank: bad write offset 0x%" HWADDR_PRIx "\n", offset); + return; + } + regs[offset / 4] = value; } static uint64_t hb_regs_read(void *opaque, hwaddr offset, unsigned size) { + uint32_t value; uint32_t *regs = opaque; - uint32_t value = regs[offset/4]; + + if (offset / 4 >= NUM_REGS) { + qemu_log_mask(LOG_GUEST_ERROR, + "highbank: bad read offset 0x%" HWADDR_PRIx "\n", offset); + return 0; + } + value = regs[offset / 4]; if ((offset == 0x100) || (offset == 0x108) || (offset == 0x10C)) { value |= 0x30000000;