From patchwork Wed May 31 12:55:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 101460 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2875635vqr; Wed, 31 May 2023 06:21:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6AZj2nnsn7fTmgtOaeL7X7GV3q8sFNrE48LhOWkPxBzsfMJZVqgyPKN0zOTXZuQ3VYDQrG X-Received: by 2002:a05:6a21:6d88:b0:10c:4a13:99e2 with SMTP id wl8-20020a056a216d8800b0010c4a1399e2mr15362884pzb.9.1685539281527; Wed, 31 May 2023 06:21:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685539281; cv=none; d=google.com; s=arc-20160816; b=z/OpVQWCwWheX7Ce4uxLeJQ270q+6GaxJejNVTQzJSVBb8jXzz0IxYYC8OuTxhsqzZ 9PWXjTIhaW5FgAbg3M+UxIszgGBjn8PvW9viGHx/G3gEPencJi4YMsRy5oqW+EYJeJs4 FA5Fd7Sn0UgZk6ynKM09Yxd8AhfPvaqqOH3sGtu4QRpsrMiLQhIE6QG02nJBkjtvFU8Z dfMwwpz6DGS121fcpDBSu9DvfZbTGSa1NOWm4A8feK9lP9+L80Q65hxjlu6L4WbyvKu6 vxrOTytLv0KDxLJL5/6zbRMxpYM3OzblN5jqCALAGfAgtSrFlEkX1Dv2PfUTnX3HZxMm T/gw== 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=sPtANn0zarNtlbKH0iiqTXeEp2bE0I2NjDJy6q2Trwk=; b=oCmOJ98TCRPTh7RXam3w/7n2rLJiGiRq4IMj/C9iOwaemyHXRRcFZROGVeKcwMGgtV 7v1sqbp2C0gt4mzMSvKYO4dNBW/Dt9nW4OoUs/Va+Nij+cPgsGZPEQ5WbDUlX+mrs58f ocjQ7mEu94T4FtB6ojwsqLQDNS7AbXYfqdA7omD+8+hQMrHmuOXkvMkFB5kwJ+miweWm hGH67phFG3NYAxdPHkzAHmOOFYK+eoc2tEKODAPoaZEqRb+HJUhYEME3srcxU8MZ30Mk oIWTwUKVyZYKQ9oJKpze2QnuIWQe/JAgabk11n1d2OgbUqxTaRgQmLsHHCchNpMRnOIT HE/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=GXv8A+lf; 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 r201-20020a632bd2000000b005348a306abcsi935610pgr.755.2023.05.31.06.21.08; Wed, 31 May 2023 06:21:21 -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=GXv8A+lf; 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 S235361AbjEaM6R (ORCPT + 99 others); Wed, 31 May 2023 08:58:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236239AbjEaM5i (ORCPT ); Wed, 31 May 2023 08:57:38 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE364E73; Wed, 31 May 2023 05:57:04 -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=sPtANn0zarNtlbKH0iiqTXeEp2bE0I2NjDJy6q2Trwk=; b=GXv8A+lfpPiEGozgarOo0bJBk0 vZ0kuwyTdXvfMvaz1OJtVddz1RV1XvwdjmxKT/EbfVACzFfzaqUrUs7na2iqOQoJY/bXEM383UoPq V3bgYWsQp0f0kuxMeKtKAAPQGAVMnkw72oRSqPi4uiTWCNRU4YqkiAkf/zC7fSbQbnju3w9VHtTQ7 14W2IwhgcSOj/itloOYpAtD8swcIVkwVfIsOowvzaYgyAZEY/qZBwHHTXgbKlWkEer5BFLFqMan3g cCbg8PczNxJS7yJuDOjQ0TO+/MEdmKOjHp9NdE3+kUHjKIISo4XKWkz1n0lfC0xMYC3OIbj7ryVsB E3s8ZvZA==; 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 1q4LNl-00HRdJ-2S; Wed, 31 May 2023 12:56:54 +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 14/24] init: clear root_wait on all invalid root= strings Date: Wed, 31 May 2023 14:55:25 +0200 Message-Id: <20230531125535.676098-15-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?1767416037552267760?= X-GMAIL-MSGID: =?utf-8?q?1767416037552267760?= Instead of only clearing root_wait in devt_from_partuuid when the UUID format was invalid, do that in parse_root_device for all strings that failed to parse. Signed-off-by: Christoph Hellwig --- init/do_mounts.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c index f1953aeb321978..0b36a5f39ee8e2 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -112,14 +112,14 @@ static int devt_from_partuuid(const char *uuid_str, dev_t *devt) /* Explicitly fail on poor PARTUUID syntax. */ if (sscanf(slash + 1, "PARTNROFF=%d%c", &offset, &c) != 1) - goto clear_root_wait; + goto out_invalid; cmp.len = slash - uuid_str; } else { cmp.len = strlen(uuid_str); } if (!cmp.len) - goto clear_root_wait; + goto out_invalid; dev = class_find_device(&block_class, NULL, &cmp, &match_dev_by_uuid); if (!dev) @@ -139,12 +139,9 @@ static int devt_from_partuuid(const char *uuid_str, dev_t *devt) put_device(dev); return 0; -clear_root_wait: +out_invalid: pr_err("VFS: PARTUUID= is invalid.\n" "Expected PARTUUID=[/PARTNROFF=%%d]\n"); - if (root_wait) - pr_err("Disabling rootwait; root= is invalid.\n"); - root_wait = 0; return -EINVAL; } @@ -611,6 +608,7 @@ static void __init wait_for_root(char *root_device_name) static dev_t __init parse_root_device(char *root_device_name) { + int error; dev_t dev; if (!strncmp(root_device_name, "mtd", 3) || @@ -623,8 +621,14 @@ static dev_t __init parse_root_device(char *root_device_name) if (strcmp(root_device_name, "/dev/ram") == 0) return Root_RAM0; - if (early_lookup_bdev(root_device_name, &dev)) + error = early_lookup_bdev(root_device_name, &dev); + if (error) { + if (error == -EINVAL && root_wait) { + pr_err("Disabling rootwait; root= is invalid.\n"); + root_wait = 0; + } return 0; + } return dev; }