Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3504117imu; Mon, 7 Jan 2019 04:43:00 -0800 (PST) X-Google-Smtp-Source: ALg8bN6aQbgnbIidbwHzGgmaQ9zhWVUdv08xrf34jdrh76JvHXTz9IQzlUJAifdn17DNAlFThSFK X-Received: by 2002:a17:902:f20d:: with SMTP id gn13mr58848954plb.11.1546864980196; Mon, 07 Jan 2019 04:43:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546864980; cv=none; d=google.com; s=arc-20160816; b=jj1UTmVxeX1vGloqXdBwV0B73I/EJf8RYs2J+cQpNbEXw6D40nCq2ZUva/z3YsrK1F Xj8f/2anQ5D4uu8X9i4gWZYs4vRiv1qNqbEN8IKG/Cy74ASV3l5AzE6gPJv35/OhEUwo 2ZqRvF0x82ios2J2GdETQQTPZ/E7sTdefLUemmxCiHKv/xkH+CMQEY66ICaee5AlYMdj KocmrsEAUAyIXl+Z+9uPaCNnePi3YD61k6WpOAcEna+N9B/TjwyjDlus1mQ5rKCW7VsQ vRUG5xpGUdfstE1KbPNOSG/5iQK5jQ78jxAoVGXYqzHkdbWY8fycxxVYhnx4PxyxIZED 8E6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=M15oeKxHonbGQiPjrjSxvHr4jnURXEjkjLis9IgRXKY=; b=XEVA2gay33P6QAd6cqluJXo4D/7T0cO30XL8Q7RtpKLjQJv3ywRoMubu4m692b3AMn c37mdHxyNfqqv0BqNuo6kIZ9ltxTEK2o7299HZPCRwUAo1LW2e8Um22zVAybCImODT9A zI8wRN92XRJQyNean59qflrtfVW46GvTlk8V3BDu5gES3wBahx/eS3gHaoS3kh/kQaJL 6oq2KNTWVlvRCJauVW75z+C+q0/KwyGqsTo7Q6BiXUGlwcrc/OPjGFH7jctMTVG8usYV FYb11bSYIydNwPfjQHcv91noVa9qrpeFyH3KmnfRnn+wcjPc0uHl0ccl0ko+9h+pGsCa 4YLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eVyPXteU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z8si61440924pgk.183.2019.01.07.04.42.45; Mon, 07 Jan 2019 04:43:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eVyPXteU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728044AbfAGMkt (ORCPT + 99 others); Mon, 7 Jan 2019 07:40:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:47134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727270AbfAGMeg (ORCPT ); Mon, 7 Jan 2019 07:34:36 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5C16321855; Mon, 7 Jan 2019 12:34:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546864475; bh=gBpEHLnwHAu8DP7iKtRnEkFc6++KR2UKXm3jxIsOG6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eVyPXteUzXoCGdjtqVl+7gfchExfjDY89RDikbnQUVkZDXbs0r/VcYKtx+N6pD8AZ 4L1rId0/KPU5abK1K4yU+ZSN0nDssBwWccRxLd0SNAVsDZDLwS90f5a1d8p3h3kwsj zFif68ctBB1W39EUo1gMMgMDtasKXJWCfBXcQtYQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Gustavo A. R. Silva" , Takashi Iwai Subject: [PATCH 4.20 024/145] ALSA: emux: Fix potential Spectre v1 vulnerabilities Date: Mon, 7 Jan 2019 13:31:01 +0100 Message-Id: <20190107104440.476724256@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107104437.308206189@linuxfoundation.org> References: <20190107104437.308206189@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gustavo A. R. Silva commit 4aea96f4237cea0c51a8bc87c0db31f0f932f1f0 upstream. info.mode and info.port are indirectly controlled by user-space, hence leading to a potential exploitation of the Spectre variant 1 vulnerability. These issues were detected with the help of Smatch: sound/synth/emux/emux_hwdep.c:72 snd_emux_hwdep_misc_mode() warn: potential spectre issue 'emu->portptrs[i]->ctrls' [w] (local cap) sound/synth/emux/emux_hwdep.c:75 snd_emux_hwdep_misc_mode() warn: potential spectre issue 'emu->portptrs' [w] (local cap) sound/synth/emux/emux_hwdep.c:75 snd_emux_hwdep_misc_mode() warn: potential spectre issue 'emu->portptrs[info.port]->ctrls' [w] (local cap) Fix this by sanitizing both info.mode and info.port before using them to index emu->portptrs[i]->ctrls, emu->portptrs[info.port]->ctrls and emu->portptrs. Notice that given that speculation windows are large, the policy is to kill the speculation on the first load and not worry if it can be completed with a dependent load/store [1]. [1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2 Signed-off-by: Gustavo A. R. Silva Cc: stable@vger.kernel.org Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/synth/emux/emux_hwdep.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/sound/synth/emux/emux_hwdep.c +++ b/sound/synth/emux/emux_hwdep.c @@ -22,9 +22,9 @@ #include #include #include +#include #include "emux_voice.h" - #define TMP_CLIENT_ID 0x1001 /* @@ -66,13 +66,16 @@ snd_emux_hwdep_misc_mode(struct snd_emux return -EFAULT; if (info.mode < 0 || info.mode >= EMUX_MD_END) return -EINVAL; + info.mode = array_index_nospec(info.mode, EMUX_MD_END); if (info.port < 0) { for (i = 0; i < emu->num_ports; i++) emu->portptrs[i]->ctrls[info.mode] = info.value; } else { - if (info.port < emu->num_ports) + if (info.port < emu->num_ports) { + info.port = array_index_nospec(info.port, emu->num_ports); emu->portptrs[info.port]->ctrls[info.mode] = info.value; + } } return 0; }