From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZqLHd7Qo4uenUh73F1nlm1J6cmTfhBNplcMmrWmlAWIt+sv+ifEfvr3Gzl5k+MH09rHcI21 ARC-Seal: i=1; a=rsa-sha256; t=1526281792; cv=none; d=google.com; s=arc-20160816; b=AqQKNPhhRKHFc3GO/5Re95K9UTjnwt/3PcKB+BxumQb2QSn/Zhp6InGIYJVT8kF1WX 4+5FfSgQMmQVuDxmV1Xog7OVdzVzx2l9Y5GflZipjps0Cdv2abAptpKmLD8/2iFxHYuU 9H44UhvCdo5kOe0fThz1fRwfi0SqWhk3eh1B5gF9sqKbjl9FIs1JmLrqlgmASfnFlOdf mew+/jz+Qk+X1wKDNCdDB2YR/20udFL0TWhgtOYl/4kGSSVeOF/qs7yFyQv5wcO1ksC6 iQWTbvqtloE315rUpzrxtchKwhnNKmBs9Aczn06vhm1R/te10e6HIP6pxM2iDbtl2Vdt hDwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=4A7rmPFyWylShK+amUFgdvx4ffWO3GhxbNC/3EtZvr0=; b=dzdN22Cj8TvNP4JjxlClKZ6YIl87kDSEtZKQYglzOWmpId6VU+Y5Sd5qcVHoLo6xbo Y4XNFmaLyCZXwHEHpc/YoIdm5G9AnqAVgdoPH+GkO4jKQwPr7j5HOBeUXFAwRwvo4Jif XZwyQlfB8S7DvYjxysnGuGixhcnxfqfTiOt8Tps3hJpyXWcvhvk9z/+EEV3s7IOCp7EI BEZd86WkCztWDf2Q69OsEH5DHqEu9GZUU8WwZS+cRdrG8g3cRKP/mWv5zUGlO3GNJr/x bawO9GZwePsPB+AD5TcD2ji453gEKlPiFVmonONzFjtTr4U1Efqih9vyM3KfEo3cc9VH x0Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ssB3qdue; spf=pass (google.com: domain of srs0=ywzk=ib=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ssB3qdue; spf=pass (google.com: domain of srs0=ywzk=ib=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , "Peter Zijlstra (Intel)" , Alexander Shishkin , Arnaldo Carvalho de Melo , Jiri Olsa , Linus Torvalds , Stephane Eranian , Thomas Gleixner , Vince Weaver , Ingo Molnar Subject: [PATCH 4.4 53/56] perf/x86/cstate: Fix possible Spectre-v1 indexing for pkg_msr Date: Mon, 14 May 2018 08:48:58 +0200 Message-Id: <20180514064759.762178200@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514064754.853201981@linuxfoundation.org> References: <20180514064754.853201981@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1600422456852165802?= X-GMAIL-MSGID: =?utf-8?q?1600422456852165802?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Zijlstra commit a5f81290ce475489fa2551c01a07470c1a4c932e upstream. > arch/x86/events/intel/cstate.c:307 cstate_pmu_event_init() warn: potential spectre issue 'pkg_msr' (local cap) Userspace controls @attr, sanitize cfg (attr->config) before using it to index an array. Reported-by: Dan Carpenter Signed-off-by: Peter Zijlstra (Intel) Cc: Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/perf_event_intel_cstate.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/x86/kernel/cpu/perf_event_intel_cstate.c +++ b/arch/x86/kernel/cpu/perf_event_intel_cstate.c @@ -88,6 +88,7 @@ #include #include #include +#include #include #include "perf_event.h" @@ -409,6 +410,7 @@ static int cstate_pmu_event_init(struct } else if (event->pmu == &cstate_pkg_pmu) { if (cfg >= PERF_CSTATE_PKG_EVENT_MAX) return -EINVAL; + cfg = array_index_nospec((unsigned long)cfg, PERF_CSTATE_PKG_EVENT_MAX); if (!pkg_msr[cfg].attr) return -EINVAL; event->hw.event_base = pkg_msr[cfg].msr;