From patchwork Thu Jul 4 16:08:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 168477 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2457740ilk; Thu, 4 Jul 2019 09:12:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvM/mM+5sKwNaXtM7hfJDN2S9Fy5LjA7+LK69xv/98kAusr6mNJKdLQhcIxpA2FGMNFHlr X-Received: by 2002:a50:9468:: with SMTP id q37mr49485276eda.163.1562256778751; Thu, 04 Jul 2019 09:12:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562256778; cv=none; d=google.com; s=arc-20160816; b=CFs3s8C5DoxCz6v6qiMIAuD5cmptNyFsWYZuuMZjwm+nKCrLI3t3YNpzdynnrfBjM9 +Ku/9oca7KDL6fi285SaqmVFo0KnmZcu7q/SQ2Jcqnl2PfC4JyjeXJ395/eCAGfszAVy 2bJiedVlD8WChLtXjXfprfaZ5jbsNbpbSH+u3JpaBoyOhn8JCpItUVo7D03jC7gQm9X1 WtnReM0wkJno2sryLL/b7Ek0qpdVQmOLMlc5iXNtTRVndLt6SVa12Arn4dPll/0Zj/QF nAqr1GGtH6sd9hwjCpD5hm04zw/pAa6ni2R1n0mEBK5rRKGEAk+txyRdu9kd7DAwCxYA t6UQ== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=ZYBnDUJAtZx/GB1Y3ulbQN75K6eLU21AWTYRu4y7eKY=; b=cPx4ZuGALMKC9GD7iI7/hibP/A8OMQYOVKu5F98ZmYDddosvelirNiO4Ocl9GmXH75 2eDlUP9zS82nhZcQTeHYTchi6b10tZaI9LV+0D7xTbZKr/omZwA1sBaal0ly72ZrZ/o8 T6IUMCFehi62qqn1nYl8N8TuTYM/ByZ4iDWzN3+/zuSSXNdV21lgvvANkPZLp9hOJwIZ OAWLUGK+yaq2AqAPZ2UoB/GRRHPNzo0ZpfBM5R7Ka8av2wQnQTccZrHEp0Q09bUEcVNY xe9dJikb5G8UhJ47C5Yf8inwpnTI1cJK++6waUYH3EKDUyAiCrScFRs/WPO1XXRgZJPs 8XgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AISnyTEv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id j26si5593426ede.86.2019.07.04.09.12.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Jul 2019 09:12:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AISnyTEv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:47438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hj4Lx-0004dB-Pk for patch@linaro.org; Thu, 04 Jul 2019 12:12:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44218) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hj4He-00084I-6W for qemu-devel@nongnu.org; Thu, 04 Jul 2019 12:08:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hj4Hb-0002J3-Qy for qemu-devel@nongnu.org; Thu, 04 Jul 2019 12:08:29 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38342) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hj4HU-00029V-8V for qemu-devel@nongnu.org; Thu, 04 Jul 2019 12:08:22 -0400 Received: by mail-wr1-x444.google.com with SMTP id p11so1674521wro.5 for ; Thu, 04 Jul 2019 09:08:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZYBnDUJAtZx/GB1Y3ulbQN75K6eLU21AWTYRu4y7eKY=; b=AISnyTEvdVKOJfjt6IejblXYshj9aENKpqh+Ur/b/hX3dMAA7E7EunEMkLtXZtxrmO 55JJWGpVEoulv5hO59X2SknscOR5EItwZJvUb7RZne8CKYL2WK4FaR7jEWtXIwITiicL QUscExFORSmRgRGjy40UXiPm5Ah3BAVJEXQYxiEf4AHYYrARKmVcxfKX3apgtavF3kBz zbzI7ImOM7N5f6vcemUD7iKT+8Oc9gTQ0TFErXHoQ5vt5Da445fBmhy2m400Gxwr7yX5 Ny1eFog0PtBXj1zASCJJvmkjb15Z/tboeDx/c2gaQfp/MvExohXWdn36mgse3u5dy8o2 Xuvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZYBnDUJAtZx/GB1Y3ulbQN75K6eLU21AWTYRu4y7eKY=; b=FnqlBZrg7af3dyqLw2kBErIDQ/EfQXQUhcWjo6PkTsOVkeLxkW9O8UyUGNm1/sEI+n vcxZR5HwgcnOki6hWsqP55jQ+daDDIUX3v2f0lSNNw5VHt0W2MD8xLf15lL+k3jioCJU R4rYEBStTZP0bn0z65RLNbCgDq0wmLuYmhdPXd0cnvjQUv9EFzfwDKA3FdRLEq9bBKbx PRTvcxtb0+fzbqmP/ZnGlK8SGd3PzHZPPBYPaB21l47qilAyrhNc+sfB4W+4tsEo55Nu ZQZUc/PiGMTNYjPnLwOklDeTp/2cu+J8AZYkQDAKf918Z+DTVjeq/k7xguLB29HAXtU0 VZfw== X-Gm-Message-State: APjAAAVFxucRl7jDE5uLZ1yoxH5PFP+tgdrW01SHQxWyi3YQO+S9aI5Q 9B6pUl6hHl8+XSY3Nu5qJ6AtC1IIqO0Ojw== X-Received: by 2002:a5d:4a02:: with SMTP id m2mr28912059wrq.193.1562256495923; Thu, 04 Jul 2019 09:08:15 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id s2sm3849690wmj.33.2019.07.04.09.08.15 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 04 Jul 2019 09:08:15 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 4 Jul 2019 17:08:00 +0100 Message-Id: <20190704160802.12419-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190704160802.12419-1-peter.maydell@linaro.org> References: <20190704160802.12419-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PULL 7/9] hw/timer/armv7m_systick: Forbid non-privileged accesses 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Like most of the v7M memory mapped system registers, the systick registers are accessible to privileged code only and user accesses must generate a BusFault. We implement that for registers in the NVIC proper already, but missed it for systick since we implement it as a separate device. Correct the omission. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20190617175317.27557-6-peter.maydell@linaro.org --- hw/timer/armv7m_systick.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c index a17317ce2fe..94640743b5d 100644 --- a/hw/timer/armv7m_systick.c +++ b/hw/timer/armv7m_systick.c @@ -75,11 +75,17 @@ static void systick_timer_tick(void *opaque) } } -static uint64_t systick_read(void *opaque, hwaddr addr, unsigned size) +static MemTxResult systick_read(void *opaque, hwaddr addr, uint64_t *data, + unsigned size, MemTxAttrs attrs) { SysTickState *s = opaque; uint32_t val; + if (attrs.user) { + /* Generate BusFault for unprivileged accesses */ + return MEMTX_ERROR; + } + switch (addr) { case 0x0: /* SysTick Control and Status. */ val = s->control; @@ -121,14 +127,21 @@ static uint64_t systick_read(void *opaque, hwaddr addr, unsigned size) } trace_systick_read(addr, val, size); - return val; + *data = val; + return MEMTX_OK; } -static void systick_write(void *opaque, hwaddr addr, - uint64_t value, unsigned size) +static MemTxResult systick_write(void *opaque, hwaddr addr, + uint64_t value, unsigned size, + MemTxAttrs attrs) { SysTickState *s = opaque; + if (attrs.user) { + /* Generate BusFault for unprivileged accesses */ + return MEMTX_ERROR; + } + trace_systick_write(addr, value, size); switch (addr) { @@ -172,11 +185,12 @@ static void systick_write(void *opaque, hwaddr addr, qemu_log_mask(LOG_GUEST_ERROR, "SysTick: Bad write offset 0x%" HWADDR_PRIx "\n", addr); } + return MEMTX_OK; } static const MemoryRegionOps systick_ops = { - .read = systick_read, - .write = systick_write, + .read_with_attrs = systick_read, + .write_with_attrs = systick_write, .endianness = DEVICE_NATIVE_ENDIAN, .valid.min_access_size = 4, .valid.max_access_size = 4,