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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 902ADC433EF for ; Fri, 1 Apr 2022 14:50:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348592AbiDAOwS (ORCPT ); Fri, 1 Apr 2022 10:52:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349322AbiDAOps (ORCPT ); Fri, 1 Apr 2022 10:45:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E8ED29B111; Fri, 1 Apr 2022 07:35:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 42BB060B9F; Fri, 1 Apr 2022 14:35:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5C61C36AE3; Fri, 1 Apr 2022 14:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648823747; bh=9/9iLykxpxjIxqulCf4eS0Gth61utHyAlCQBiVJTpdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F2GyoCPuE5noCNOWe0Jexxn+1CwAUT9Fk/QvCtoPtInWU+L+990YZPUdM0ave7GmE 7nCbtS7Cn0/CE/fPotE+B6+l87obqJbV0SQW99dCrMP+Tee5w8yvwmqcV22sdx3R/E uHXwqOBu1XcgF5FSgmkM1wJBjZZPD24cg1KzE7xHVG3OJyglcZi+iROwHKQfdtfs5U JqWy0d5/W9oefqzd8taPY6e0pK3PMMX4dNwFbUUCu0q14FNLLRgoXrlVAcGQphmPoO ObZSWsE0/9oYLREND2rtSEM+cGOVuu84YHLFRWwWdpk3gC+EtPqi6o5ZEytcsUuZAo lJNZ90FhfrVjg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jordy Zomer , Jordy Zomer , Mike Snitzer , Sasha Levin , agk@redhat.com, snitzer@kernel.org, dm-devel@redhat.com Subject: [PATCH AUTOSEL 5.16 060/109] dm ioctl: prevent potential spectre v1 gadget Date: Fri, 1 Apr 2022 10:32:07 -0400 Message-Id: <20220401143256.1950537-60-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401143256.1950537-1-sashal@kernel.org> References: <20220401143256.1950537-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jordy Zomer [ Upstream commit cd9c88da171a62c4b0f1c70e50c75845969fbc18 ] It appears like cmd could be a Spectre v1 gadget as it's supplied by a user and used as an array index. Prevent the contents of kernel memory from being leaked to userspace via speculative execution by using array_index_nospec. Signed-off-by: Jordy Zomer Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm-ioctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 21fe8652b095..901abd6dea41 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -1788,6 +1789,7 @@ static ioctl_fn lookup_ioctl(unsigned int cmd, int *ioctl_flags) if (unlikely(cmd >= ARRAY_SIZE(_ioctls))) return NULL; + cmd = array_index_nospec(cmd, ARRAY_SIZE(_ioctls)); *ioctl_flags = _ioctls[cmd].flags; return _ioctls[cmd].fn; } -- 2.34.1