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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,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 3A9EFC072B1 for ; Thu, 30 May 2019 03:51:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D90B24DAE for ; Thu, 30 May 2019 03:51:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559188300; bh=z2r8VEfhDv9zNBaQYC726fsNdOFlBHXcU//bG1jCdYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UWWDuRuohCUKcT5bS68/q0noUKbVqnrw2GqJsNiMslXIB8IHl3hezP3iQVkmoq4Ti n4Lm1prdHuIySHx8XfYSkygSjxsoSrlatI+nf0eQ6A6ccR+vEijmRGZUQANGLHi8vz WxMR+gW9EXU6mp8+h2KMEhsr3ffHRYzCmqg/mdeA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387507AbfE3Dve (ORCPT ); Wed, 29 May 2019 23:51:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:56670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732020AbfE3DTq (ORCPT ); Wed, 29 May 2019 23:19:46 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 83B3F247F7; Thu, 30 May 2019 03:19:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186386; bh=z2r8VEfhDv9zNBaQYC726fsNdOFlBHXcU//bG1jCdYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MfPizdvP4UAHgtRHWyG1Oczp4te5rQcvgZvSawVMZn9BEY5E05UpTnYjQJ40TZTDh 3aMlATm6URksF37YrDx9V0lC4HPqGqxQqEzim5czL1ho6EA1qYR7nWX/l0NDJMcDlj nkxUnSrRFWFv2HWt/178UpjT4LuPmTzztNshflPY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chengguang Xu , Sasha Levin Subject: [PATCH 4.14 155/193] chardev: add additional check for minor range overlap Date: Wed, 29 May 2019 20:06:49 -0700 Message-Id: <20190530030509.856072918@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030446.953835040@linuxfoundation.org> References: <20190530030446.953835040@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit de36e16d1557a0b6eb328bc3516359a12ba5c25c ] Current overlap checking cannot correctly handle a case which is baseminor < existing baseminor && baseminor + minorct > existing baseminor + minorct. Signed-off-by: Chengguang Xu Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- fs/char_dev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/char_dev.c b/fs/char_dev.c index a65e4a56318ca..20ce45c7c57c7 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -159,6 +159,12 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor, ret = -EBUSY; goto out; } + + if (new_min < old_min && new_max > old_max) { + ret = -EBUSY; + goto out; + } + } cd->next = *cp; -- 2.20.1