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,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 4826AC2BA19 for ; Wed, 15 Apr 2020 12:53:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21FA620737 for ; Wed, 15 Apr 2020 12:53:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586955227; bh=O9zMXw7EVV/7T8D8FIM99Vc76xzMBdRqHU46kaUojBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O+ubgqHFsfDIYpUO4c/Gar+p3ZoHNn2qo+lMfsu1fh4WJOPteYGjaGYnZ7jaOFi84 yPby7yyA2Q6PROZi1c3UsaHOhZb42R/VIhUzSOPsJ1nIfK/OOCu1g+hCTaS8dmYgtH J8rleBeoUeYLSNIFDPePdpEFZ1YEkyRNrqtH7XY4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S370584AbgDOMxn (ORCPT ); Wed, 15 Apr 2020 08:53:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:57372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2897220AbgDOLhN (ORCPT ); Wed, 15 Apr 2020 07:37:13 -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 F318820768; Wed, 15 Apr 2020 11:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586950633; bh=O9zMXw7EVV/7T8D8FIM99Vc76xzMBdRqHU46kaUojBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OYpIsVMNBA/ASHTyM8jh6UYh5W1dkPKOhw7p6nDAUCQTpiSnJcYHAEHgoP7cEveem Se2qx0TynC4V/o84rm2HVnd4IojxQs1eAYVCONT+I0JpSJqhVMqW++mtTxktgkmeNK gJ+Vhp5HPfyt/xYqdn3VJVcC/sZObbB6KEqIH1QY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Dan Williams , Sasha Levin , linux-nvdimm@lists.01.org Subject: [PATCH AUTOSEL 5.6 124/129] libnvdimm: Out of bounds read in __nd_ioctl() Date: Wed, 15 Apr 2020 07:34:39 -0400 Message-Id: <20200415113445.11881-124-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415113445.11881-1-sashal@kernel.org> References: <20200415113445.11881-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: Dan Carpenter [ Upstream commit f84afbdd3a9e5e10633695677b95422572f920dc ] The "cmd" comes from the user and it can be up to 255. It it's more than the number of bits in long, it results out of bounds read when we check test_bit(cmd, &cmd_mask). The highest valid value for "cmd" is ND_CMD_CALL (10) so I added a compare against that. Fixes: 62232e45f4a2 ("libnvdimm: control (ioctl) messages for nvdimm_bus and nvdimm devices") Signed-off-by: Dan Carpenter Link: https://lore.kernel.org/r/20200225162055.amtosfy7m35aivxg@kili.mountain Signed-off-by: Dan Williams Signed-off-by: Sasha Levin --- drivers/nvdimm/bus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index a8b5159685699..09087c38fabdc 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -1042,8 +1042,10 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, return -EFAULT; } - if (!desc || (desc->out_num + desc->in_num == 0) || - !test_bit(cmd, &cmd_mask)) + if (!desc || + (desc->out_num + desc->in_num == 0) || + cmd > ND_CMD_CALL || + !test_bit(cmd, &cmd_mask)) return -ENOTTY; /* fail write commands (when read-only) */ -- 2.20.1