From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDACEC43612 for ; Mon, 7 Jan 2019 13:06:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B848621855 for ; Mon, 7 Jan 2019 13:06:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546866366; bh=848c5EXCAMChJV4lobp6UKu9PQQ3UB6BXwM+uUVsZu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=X6clDcOzTVVfdWgQyzhZUlBIFdi6ixtXJ9pNfyo5s+Kw94lkTYStjIkNvbP7RI0Mr wCWfTBNuI5GdB1GCDhZAedtAIoNCLNlTMSejA9df01uqhioLHg2nZxaBO4+83eBlVQ Zh59qJ0RT29QKJK1gXExCt1p8s7eJsczyAs+mNeI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728005AbfAGNGA (ORCPT ); Mon, 7 Jan 2019 08:06:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:53512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727786AbfAGNGA (ORCPT ); Mon, 7 Jan 2019 08:06:00 -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 417BA217D4; Mon, 7 Jan 2019 13:05:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546866359; bh=848c5EXCAMChJV4lobp6UKu9PQQ3UB6BXwM+uUVsZu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOvukLllOsT/7IqcyfoctQ2G7ZuHcOAyI229nA94Dp+zHE1xq9WOLc56qiDDdu5Ii YvCAlwteVsnIukTilK+kY4Uu3N9vXn3L9cT+aazV/rYumTgUC5pZsmElNSf9nsIQPh PrCECyFwhaCpE/h6vxpDb6ujQxG2JdzDq3pNbsMs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Gustavo A. R. Silva" , "David S. Miller" Subject: [PATCH 4.9 05/71] phonet: af_phonet: Fix Spectre v1 vulnerability Date: Mon, 7 Jan 2019 13:32:34 +0100 Message-Id: <20190107105330.590339037@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107105330.280153213@linuxfoundation.org> References: <20190107105330.280153213@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Gustavo A. R. Silva" [ Upstream commit d686026b1e6ed4ea27d630d8f54f9a694db088b2 ] protocol is indirectly controlled by user-space, hence leading to a potential exploitation of the Spectre variant 1 vulnerability. This issue was detected with the help of Smatch: net/phonet/af_phonet.c:48 phonet_proto_get() warn: potential spectre issue 'proto_tab' [w] (local cap) Fix this by sanitizing protocol before using it to index proto_tab. 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/phonet/af_phonet.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c @@ -34,6 +34,8 @@ #include #include +#include + /* Transport protocol registration */ static struct phonet_protocol *proto_tab[PHONET_NPROTO] __read_mostly; @@ -43,6 +45,7 @@ static struct phonet_protocol *phonet_pr if (protocol >= PHONET_NPROTO) return NULL; + protocol = array_index_nospec(protocol, PHONET_NPROTO); rcu_read_lock(); pp = rcu_dereference(proto_tab[protocol]);