From patchwork Wed Apr 22 09:57:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 227066 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 25DEFC5518A for ; Wed, 22 Apr 2020 10:54:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 060CD20774 for ; Wed, 22 Apr 2020 10:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587552895; bh=8ueGKzVpssWmv48W/XObwKppzjDuII99J2uriC02WAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SplrzK7lx66ZVMaloaLV0M2Uyyybm2UCsb0Z/nVjbmXRrde6LGN0iDZ96oQEtcXK8 Mgyd7XJ2IY0cnKwADueZrlmWOkK+pB7KUx89YzM2bY47hvqTdr/E4Ipci+foiMZEr5 r6w0Nngs9lrvX1HvltFlAYom53Qs+ZaKy0d0sJQ8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728769AbgDVKyu (ORCPT ); Wed, 22 Apr 2020 06:54:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:60202 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728546AbgDVKHd (ORCPT ); Wed, 22 Apr 2020 06:07:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 65C1D2076C; Wed, 22 Apr 2020 10:07:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550052; bh=8ueGKzVpssWmv48W/XObwKppzjDuII99J2uriC02WAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hDA95+Y8K9kPsjAIlFwMrX9LB3QSPJ6iwCTB14YdNlYi6Vv+ph9dK5lU1hcZ8O1ld SmrFV8LtMegjYArOiBzcBNXz5ihNaV+8+/OVOhUdFhdvZXZYiv6psRH5GYTaryc4OT m9iPIxtJIr62afjZ1qlaCg4UO9MQ/jc1hCe9qLSU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Dan Williams , Sasha Levin Subject: [PATCH 4.9 116/125] libnvdimm: Out of bounds read in __nd_ioctl() Date: Wed, 22 Apr 2020 11:57:13 +0200 Message-Id: <20200422095051.377352040@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095032.909124119@linuxfoundation.org> References: <20200422095032.909124119@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 5768a4749564a..65ac1d3870f93 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -851,8 +851,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) */