From patchwork Mon Mar 25 14:31:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 161123 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4042932jan; Mon, 25 Mar 2019 07:32:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqwrsdVeXY0Sg/tae+AosF0vphlVKRxDPRXqDiOOx/u6XsbsgfOkxOF46eOYTQs+gm5Xh+Y0 X-Received: by 2002:a25:aa6e:: with SMTP id s101mr20070980ybi.18.1553524363095; Mon, 25 Mar 2019 07:32:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553524363; cv=none; d=google.com; s=arc-20160816; b=EIumwcujqbq1fsecRnkOFwRMPGDyZ10F3vrF3L3mE3yR3BgRuf36+onaJ2KJ2M9aHQ 0ONkIZ0i5+Kh+xntT/jOm3vS9vclrF07etFq2uVOnSzPvzZSJKrGnKHj5zJZkreRYuta Weh/HWH+7sXQdIZYZ5jKT1PiB8VcXpH2zPpXtaPH+GHdXxySxDKyVFiKhOOZ1D6RgfyD S1j1lnrKpI3vIHDLQAYuThwf26xlzfQcDRasW+BWKeNzVnE7w4RyssJtM3OG49HHLo4e op7VzbI0/WdelPw7nZHPrUXtr0vWSWi9ZSybz2DH/dyOGd5Z6YByAtPv9oPD0m/fNgb7 m6og== 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=gWbZaVP3mgHOFctibEYCiGmxb7fmhci6B2Ar678NJ70=; b=RAUHY5znFugvOdOhlzUFMnfrSLS4XhqBpWQRGuIZc7zeIEs9En3lvL7AyqRIiNCQ6W F4/0o/QU/08vZ5PxzFxiZ8OSDx87v6bMh1Erv0f2F7ZsHO1w+GZCX0hLXp5demrlLiOL ovMmgaFWvuB7BsnVpDmrA7xGvyzlz67Yn+ALYer1+aAdQLOELXQJDD5Sf2vW3WsFtQhx rCAiTjxsxdjplF85iOm7XiRqO0kCh2lotdpvz1Wfl+RpyXei7ecFBD51a7QRg2pQFrfh 9C6rFiRqpLzrB62W1d6qqhwfu6dMzSJdKv+ycmnTCHs5JNe9ByzhME3mrTNguygZ56nd IJzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pHo7jAXf; 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 x66si9660155ybx.492.2019.03.25.07.32.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 07:32:43 -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=pHo7jAXf; 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 ([127.0.0.1]:43439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8QeY-0000Vm-JL for patch@linaro.org; Mon, 25 Mar 2019 10:32:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8Qdu-0000Nw-II for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8Qdt-00022g-Mp for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:02 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:46907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8Qdt-00022D-EY for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:01 -0400 Received: by mail-wr1-x42a.google.com with SMTP id o1so10388620wrs.13 for ; Mon, 25 Mar 2019 07:32:01 -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=gWbZaVP3mgHOFctibEYCiGmxb7fmhci6B2Ar678NJ70=; b=pHo7jAXfa6m64h8RPidhR9NMSRO/RsSBNBQcJJlWj8mrT1eEUNrc1MGBvdj3Ue03WS WPvQ2ODksG/1N51lJrmZ48cxfBvYPaLvvTm3rTKJd3iLfK/BkJQeUnmZ4DvO+D5u6uYi EXXS3VxubFtMb8crL/02OU0OnJoaYYynoTQOxKli2CKJ/Ahk0I4DhhcGfRR/U9NiHQcT U7Depq+Q8chcloIKoFh1gm8Q+8UYBX8hcMoFZGHfGLWHrDkNMqXFTjByJ+nCdq4OwlP6 St6trNYC9DCPTO1my3Uwd20B79zZQEYvMmjOa6wCgXKMArWweBYpLsI6NfqoopGH3Ixz l4wg== 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=gWbZaVP3mgHOFctibEYCiGmxb7fmhci6B2Ar678NJ70=; b=fY3c/sHZ23Jvn3cZfVD7buQuD7gQ6WaDse8QqaPELCzVZeRm17Bguu5KEXcHXwl0y3 6hIyWy3lKNoNgPwEGdlS7Stz/cqWUJvKpCWYryMy2XSC6TWNaf3TM2zMgickJCvSxwXO U8OeTjs0ghKZtzwQUZwDac+yV0U0cpTyzVwVE94iNpWuAFxjy07RnOmhgVasWsbPzcWX FCVe5eDFaNVNTQ6q7uKfi+Bv70grtYo3iCk7eKBydrXgZFWVv+Qt/WviUVdx02eD3Z26 dR20cr8MiQrPQLmkWE9+pzqJglNI1a8j1Ae51mLQFlIDd3VAEwOdo9q83DmXMf5MV+XM 85rg== X-Gm-Message-State: APjAAAUMbU9xg5kztRDYs5aShJM/s5cj4HqyTF0IO7TaaEQk4mDHOKjX OI+YO7oml5nQnkEIaGqEuz9NLY8T/JE= X-Received: by 2002:adf:fcc5:: with SMTP id f5mr16066053wrs.166.1553524320322; Mon, 25 Mar 2019 07:32:00 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j1sm18858048wme.4.2019.03.25.07.31.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 07:31:59 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 25 Mar 2019 14:31:50 +0000 Message-Id: <20190325143152.9981-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325143152.9981-1-peter.maydell@linaro.org> References: <20190325143152.9981-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::42a Subject: [Qemu-devel] [PULL 4/6] target/arm: fix crash on pmu register 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: Andrew Jones Fix a QEMU NULL derefence that occurs when the guest attempts to enable PMU counters with a non-v8 cpu model or a v8 cpu model which has not configured a PMU. Fixes: 4e7beb0cc0f3 ("target/arm: Add a timer to predict PMU counter overflow") Signed-off-by: Andrew Jones Reviewed-by: Richard Henderson Message-id: 20190322162333.17159-2-drjones@redhat.com Signed-off-by: Peter Maydell --- target/arm/helper.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index c8d3c213b6b..fc73488f6cc 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1259,6 +1259,10 @@ static bool pmu_counter_enabled(CPUARMState *env, uint8_t counter) int el = arm_current_el(env); uint8_t hpmn = env->cp15.mdcr_el2 & MDCR_HPMN; + if (!arm_feature(env, ARM_FEATURE_PMU)) { + return false; + } + if (!arm_feature(env, ARM_FEATURE_EL2) || (counter < hpmn || counter == 31)) { e = env->cp15.c9_pmcr & PMCRE;