Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp988816yba; Thu, 4 Apr 2019 01:51:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqwWdhCSCJOkVtrbLgbVVyI3jEe452cOxZfbkHBrDoeXPVTkq21+wU02D77ZKcxJmOoS8BLu X-Received: by 2002:a62:7648:: with SMTP id r69mr4561482pfc.114.1554367909708; Thu, 04 Apr 2019 01:51:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554367909; cv=none; d=google.com; s=arc-20160816; b=pCpUtyOb63E3X6Dxr61muJrLELrGniHXPD89KxVaEVD4ViSE0AxuCDFdjBJJn+TscR SMtm7IhbZyhfW7/g2/rhIGyqHw1xmB+5/YjoTK3szR3frmWP6Mbl6KtJmEzzLVK1Ng/X 01rvhE9Ta089wGMsususJm61zI4BP05WVnc156PC75t1/EkgIT2LkxXI5n6PUGZFVh4S 1aPmtOHpBE4IIVZI3CbleqGKmCbmW643YMeqmBJEaVc97RNpLhPpU2J4RsXJ7CTEJWrG iq2Evi+1O0aZUAucROR+PEt2owAzHqlP3XNS2eNj7pTlR/2EDCCl530T4M13e9teT1z3 pxLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=K4W8yCWAdvQEvkJnC2DhdZ5kaKK3OE+ZeVlfIuspmJk=; b=ig1fZ5ERzd8IIR6b/JsvhR2aA0mqO62l4qS4qBZ7dpVNitNvY4N6RzYjiZZAhofpKo 0f1Q0Ngrcgr0ZMIrrHTZvCBRkVM8RveNOUZNH6yYu2mJwTnNAdSOHumPz7z2EgTCU2+o XbzXrOCdbii/ZN/l7Oo5GBlDoAH80JbwlegXa20QKk/K+3xOfsiyyB440Qa4YdvSbY3M 96DDY4X0LO9+NXUvxDP4QlrZRMk/jbgwys2ZLFgHacu3Yw7H1CVnmaUala9ROvEIxtiL hyEBNlui/e6wkvn/YSmnl6FZZk8hxZEghB9TgSqN20Ha1G1vg7onM4qf0T+PfMbzbjr2 S2Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sRqIRJQD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t3si9173839plq.181.2019.04.04.01.51.34; Thu, 04 Apr 2019 01:51:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sRqIRJQD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729080AbfDDIuZ (ORCPT + 99 others); Thu, 4 Apr 2019 04:50:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:51472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729071AbfDDIuW (ORCPT ); Thu, 4 Apr 2019 04:50:22 -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 7D1A820855; Thu, 4 Apr 2019 08:50:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554367822; bh=pIw1yKbOLa9exSziBoVm65hYjjAInoEtdGFbdlMcX6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sRqIRJQDSxa70l3+lcP3hlnveyhEAS/+Jqe55u6ppSx7n7mmyK4/aH+U5PisL7Gqa o9F7/ZKVSSx8ktVtL7RtsH4DsYvUIuZ1egV0tchYRaTbgQ9svgJumpOI0hMIbH9QiM hHUoCDu8qnUeHV6oCIso4+iNyAhqUIpIEE0a5dog= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Jason Cai (Xiang Feng)" , Mike Snitzer , Sasha Levin Subject: [PATCH 4.9 25/91] dm thin: add sanity checks to thin-pool and external snapshot creation Date: Thu, 4 Apr 2019 10:47:09 +0200 Message-Id: <20190404084536.920968746@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084535.450029272@linuxfoundation.org> References: <20190404084535.450029272@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 70de2cbda8a5d788284469e755f8b097d339c240 ] Invoking dm_get_device() twice on the same device path with different modes is dangerous. Because in that case, upgrade_mode() will alloc a new 'dm_dev' and free the old one, which may be referenced by a previous caller. Dereferencing the dangling pointer will trigger kernel NULL pointer dereference. The following two cases can reproduce this issue. Actually, they are invalid setups that must be disallowed, e.g.: 1. Creating a thin-pool with read_only mode, and the same device as both metadata and data. dmsetup create thinp --table \ "0 41943040 thin-pool /dev/vdb /dev/vdb 128 0 1 read_only" BUG: unable to handle kernel NULL pointer dereference at 0000000000000080 ... Call Trace: new_read+0xfb/0x110 [dm_bufio] dm_bm_read_lock+0x43/0x190 [dm_persistent_data] ? kmem_cache_alloc_trace+0x15c/0x1e0 __create_persistent_data_objects+0x65/0x3e0 [dm_thin_pool] dm_pool_metadata_open+0x8c/0xf0 [dm_thin_pool] pool_ctr.cold.79+0x213/0x913 [dm_thin_pool] ? realloc_argv+0x50/0x70 [dm_mod] dm_table_add_target+0x14e/0x330 [dm_mod] table_load+0x122/0x2e0 [dm_mod] ? dev_status+0x40/0x40 [dm_mod] ctl_ioctl+0x1aa/0x3e0 [dm_mod] dm_ctl_ioctl+0xa/0x10 [dm_mod] do_vfs_ioctl+0xa2/0x600 ? handle_mm_fault+0xda/0x200 ? __do_page_fault+0x26c/0x4f0 ksys_ioctl+0x60/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x150 entry_SYSCALL_64_after_hwframe+0x44/0xa9 2. Creating a external snapshot using the same thin-pool device. dmsetup create thinp --table \ "0 41943040 thin-pool /dev/vdc /dev/vdb 128 0 2 ignore_discard" dmsetup message /dev/mapper/thinp 0 "create_thin 0" dmsetup create snap --table \ "0 204800 thin /dev/mapper/thinp 0 /dev/mapper/thinp" BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 ... Call Trace: ? __alloc_pages_nodemask+0x13c/0x2e0 retrieve_status+0xa5/0x1f0 [dm_mod] ? dm_get_live_or_inactive_table.isra.7+0x20/0x20 [dm_mod] table_status+0x61/0xa0 [dm_mod] ctl_ioctl+0x1aa/0x3e0 [dm_mod] dm_ctl_ioctl+0xa/0x10 [dm_mod] do_vfs_ioctl+0xa2/0x600 ksys_ioctl+0x60/0x90 ? ksys_write+0x4f/0xb0 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x150 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Signed-off-by: Jason Cai (Xiang Feng) Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm-thin.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c index 345f4d81ba07..23a7e108352a 100644 --- a/drivers/md/dm-thin.c +++ b/drivers/md/dm-thin.c @@ -3295,6 +3295,13 @@ static int pool_ctr(struct dm_target *ti, unsigned argc, char **argv) as.argc = argc; as.argv = argv; + /* make sure metadata and data are different devices */ + if (!strcmp(argv[0], argv[1])) { + ti->error = "Error setting metadata or data device"; + r = -EINVAL; + goto out_unlock; + } + /* * Set default pool features. */ @@ -4177,6 +4184,12 @@ static int thin_ctr(struct dm_target *ti, unsigned argc, char **argv) tc->sort_bio_list = RB_ROOT; if (argc == 3) { + if (!strcmp(argv[0], argv[2])) { + ti->error = "Error setting origin device"; + r = -EINVAL; + goto bad_origin_dev; + } + r = dm_get_device(ti, argv[2], FMODE_READ, &origin_dev); if (r) { ti->error = "Error opening origin device"; -- 2.19.1