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=ham 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 1EF8DC31E40 for ; Tue, 6 Aug 2019 21:38:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6AB1218A6 for ; Tue, 6 Aug 2019 21:38:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127496; bh=WfJITCGv9bAQKx9HPueqnYT/6ry3FvjBX8ESFIOFElE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nb3vFz1Ifzds4urKGhgblStNRg3zAQBoCliXzU9ogWNNhFpU0e6eZIm4PfIH9D0xA VZYBWE8CLywlT0h3G3C253lc94e3MbVGeKecRWAMKtdeWlHv3qAmQo7zqQONbuFdez 6/wm6IKIpVk26weDd9700k4d+NKg8/Z+0AWtmO5A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729672AbfHFViO (ORCPT ); Tue, 6 Aug 2019 17:38:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:55844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727570AbfHFViL (ORCPT ); Tue, 6 Aug 2019 17:38:11 -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 3F27A20C01; Tue, 6 Aug 2019 21:38:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127489; bh=WfJITCGv9bAQKx9HPueqnYT/6ry3FvjBX8ESFIOFElE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sW90APsVeVDQpVt0nOUMuZbfmaBLu3nOLRBaSBz8k4V8L+r81JZ10Z/5GI9GMdI2k E5Dck8mVYOXVDeQyjL+HdyiMBi4o2OfyYudNuWmof4IVOnD7o3R30hKxAGtAYH28nE E9BpGXkLMXNlSiOBAmnjrs8lycC5wmtXrj5ZLL+Q= 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.4 11/14] IB/core: Add mitigation for Spectre V1 Date: Tue, 6 Aug 2019 17:37:45 -0400 Message-Id: <20190806213749.20689-11-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806213749.20689-1-sashal@kernel.org> References: <20190806213749.20689-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 57f281f8d6862..e9e75f40714cb 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c @@ -49,6 +49,7 @@ #include #include #include +#include #include @@ -842,11 +843,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