From patchwork Wed May 31 12:55:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 101453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2871644vqr; Wed, 31 May 2023 06:15:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5bbzffSsYy3S6Tuw8kddy87dmyj9Jnv2AiNySkdoUsYkYetiFLiwgZ8kEbV4Y0UPFzj3CK X-Received: by 2002:a05:6a00:1816:b0:63b:8423:9e31 with SMTP id y22-20020a056a00181600b0063b84239e31mr5224887pfa.11.1685538950171; Wed, 31 May 2023 06:15:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685538950; cv=none; d=google.com; s=arc-20160816; b=PdcopTtP4+o7N5MjousNP3owUWcJQVJSVQm5RmEc+aGGc2tHDKu0vXe9m4ul8uCcE1 4RkvQOZjuC6AlMvgxaOLPBqesqKOr4uz1gSd95NvZAy/PnkDOThBuXOMGYK/gcDDzw8Y ITfgTfhkuMsyQ1+NClmB9kdYN59/ls8NrRt5nyEHdrxOa2DhneHO2Rcrv+OzJICNqC2L 5DofcFuElubd3n597DKosCpDjSou4yo+Ga/wYeeRsKTj0kmUZQ+zJ3sHgYa6GlVt7FqS dEhRiqxbVPLO9l79vU5/sXmWoA5YO+qmRmfThvIvRMdeO5lCrMDEj0VSzi202aZguuWQ LAKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BkMJYLyGIWkYjuepxBcnRSaYAK6gaKTk6CK4IG7Jagc=; b=wZ8/yV4EMV8bl2Jfh/VvtTozKsOlmtJIFtzCnxmiMtEAfnrXWLZbJ3TWclE1yeBeEm zG4iMY331NlPTaZU3UXgzDFQTgIkkM4he9mQrrs8pNVpBronzl2AuY+eUA8IlnaO81Pm Ztp5h+lsNyJ3oZr+cYMubWrflrYPSkxAdzFcpUwJOgr74IvEUBu1TzZb49Yu9izfZsYc ZaxbxGe4lr9Os/G5pwFfBbTh76IN+QvU4hDpAZFIKIu+LaZdLoAuUT/J8J8N2UWwbyHT fEZAIKzCvWPAQkl5rcR7XfBLHmQ+vUz0q6AXnI86+tgqZJkYbTCyOAfuADjrXc5F5q6B AAiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=a+V7FBYO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k191-20020a636fc8000000b0053076a4da8esi918264pgc.761.2023.05.31.06.15.38; Wed, 31 May 2023 06:15:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=a+V7FBYO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236040AbjEaM76 (ORCPT + 99 others); Wed, 31 May 2023 08:59:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236287AbjEaM7a (ORCPT ); Wed, 31 May 2023 08:59:30 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8649410F2; Wed, 31 May 2023 05:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=BkMJYLyGIWkYjuepxBcnRSaYAK6gaKTk6CK4IG7Jagc=; b=a+V7FBYOqSmWKU7BICZS8m3Pog +h3Wz3MRqEpA0GkjgoCFFAOXNSXfvpmy5id6oojyv9QqLV7MkTKk0Y5pwXC7oH2wJ9DETfyR0ADG3 DzmcF5ncYO4eRGu5mLsP257uUY9Q0chtNa0qjQLb4WWpKmviXwqrs9D2Nufl2sc+eHtS2jeWmimII Ytpa1OApjHx7Mn71mygtkjZeJ4on69jBo/44nLan9GaBimk8uVuIZSrv+8dK6+S7aq+W6CFqHrif2 8n1RAXi+ug1lZN2STbBwExeulaEYzJiDQAZr33zrGslFVOc6nBvN+uMr6dcNqOdad/4g/pxDgXYAv yPZMz2JQ==; Received: from [2001:4bb8:182:6d06:2e49:a56:513a:92ee] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1q4LOQ-00HSDd-2L; Wed, 31 May 2023 12:57:35 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , Mike Snitzer , Joern Engel , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Pavel Machek , Loic Poulain , dm-devel@redhat.com, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-mtd@lists.infradead.org, linux-pm@vger.kernel.org Subject: [PATCH 23/24] mtd: block2mtd: don't call early_lookup_bdev after the system is running Date: Wed, 31 May 2023 14:55:34 +0200 Message-Id: <20230531125535.676098-24-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531125535.676098-1-hch@lst.de> References: <20230531125535.676098-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767415690367547214?= X-GMAIL-MSGID: =?utf-8?q?1767415690367547214?= early_lookup_bdev is supposed to only be called from the early boot code, but mdtblock_early_get_bdev is called as a general fallback when lookup_bdev fails, which is problematic because early_lookup_bdev bypasses all normal path based permission checking, and might cause problems with certain container environments renaming devices. Switch to only call early_lookup_bdev when block2mtd is built-in and the system state in not running yet. Note that this strictly speaking changes the kernel ABI as the PARTUUID= and PARTLABEL= style syntax is now not available during a running systems. They never were intended for that, but this breaks things we'll have to figure out a way to make them available again. But if avoidable in any way I'd rather avoid that. Signed-off-by: Christoph Hellwig Reviewed-by: Miquel Raynal --- drivers/mtd/devices/block2mtd.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index 182eed68c75634..59e4c71cfc6f53 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c @@ -215,13 +215,23 @@ static void block2mtd_free_device(struct block2mtd_dev *dev) kfree(dev); } -static struct block_device *mdtblock_early_get_bdev(const char *devname, +/* + * This function is marked __ref because it calls the __init marked + * early_lookup_bdev when called from the early boot code. + */ +static struct block_device __ref *mdtblock_early_get_bdev(const char *devname, fmode_t mode, int timeout, struct block2mtd_dev *dev) { struct block_device *bdev = ERR_PTR(-ENODEV); #ifndef MODULE int i; + /* + * We can't use early_lookup_bdev from a running system. + */ + if (system_state >= SYSTEM_RUNNING) + return bdev; + /* * We might not have the root device mounted at this point. * Try to resolve the device name by other means.