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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 07E6DC31E40 for ; Tue, 6 Aug 2019 21:40:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C54C621874 for ; Tue, 6 Aug 2019 21:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127608; bh=2P/LAz0GENjFXbtSol/xhQKYORph8aRoqcmZEP90JyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KGDm+jYS+xFgiFIYLQkQ1a3UAb8Omn1BO/vYMWbBVxP9PukAGpurNORq2LtwGm70I r9WznBaptuwXrdhbMg7pVRfa8m0oAjXNhs6sgRK5W6Ci44/g4r23MKb9kuPv79ns90 W8GtGXFGAbQfmfueYRs7m+wkSXgX8IpMJ0/iWqLw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729196AbfHFVhG (ORCPT ); Tue, 6 Aug 2019 17:37:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:54866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729215AbfHFVhG (ORCPT ); Tue, 6 Aug 2019 17:37:06 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4970D2089E; Tue, 6 Aug 2019 21:37:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127424; bh=2P/LAz0GENjFXbtSol/xhQKYORph8aRoqcmZEP90JyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UrbQFp7quu185Adif8Az/ab+6RG2ai80lPMH7Wv06pDQTNl1JBWfXM8Pb0PJ9vZ3C OB2LFUQdXR2rS646MoVm8G+QzFGQDtCUXrWNI1x3QDGD4f7ByrXVgASnse3/mlKkNx Xtko7HjUvfz80v15L0t5jV1KCcxm5lsn9QL74QF8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Luck, Tony" , Doug Ledford , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 20/25] IB/core: Add mitigation for Spectre V1 Date: Tue, 6 Aug 2019 17:36:17 -0400 Message-Id: <20190806213624.20194-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806213624.20194-1-sashal@kernel.org> References: <20190806213624.20194-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "Luck, Tony" [ Upstream commit 61f259821dd3306e49b7d42a3f90fb5a4ff3351b ] Some processors may mispredict an array bounds check and speculatively access memory that they should not. With a user supplied array index we like to play things safe by masking the value with the array size before it is used as an index. Signed-off-by: Tony Luck Link: https://lore.kernel.org/r/20190731043957.GA1600@agluck-desk2.amr.corp.intel.com Signed-off-by: Doug Ledford Signed-off-by: Sasha Levin --- drivers/infiniband/core/user_mad.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 6511cb21f6e20..4a137bf584b04 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c @@ -49,6 +49,7 @@ #include #include #include +#include #include @@ -856,11 +857,14 @@ static int ib_umad_unreg_agent(struct ib_umad_file *file, u32 __user *arg) if (get_user(id, arg)) return -EFAULT; + if (id >= IB_UMAD_MAX_AGENTS) + return -EINVAL; mutex_lock(&file->port->file_mutex); mutex_lock(&file->mutex); - if (id >= IB_UMAD_MAX_AGENTS || !__get_agent(file, id)) { + id = array_index_nospec(id, IB_UMAD_MAX_AGENTS); + if (!__get_agent(file, id)) { ret = -EINVAL; goto out; } -- 2.20.1