From patchwork Thu Oct 12 13:44:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 13419288 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83EDF29436 for ; Thu, 12 Oct 2023 13:44:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KpcNF2DJ" Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D31E94; Thu, 12 Oct 2023 06:44:41 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3248ac76acbso827972f8f.1; Thu, 12 Oct 2023 06:44:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697118280; x=1697723080; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=++BNR3CLM1Hqkl3ibmZEgetPNeFTdnn0TXTRaeDafCU=; b=KpcNF2DJlP0nn0y1Fm268BDu8hZWmd1Q8bZXxf2Fup1QLVumBS4HWk9R2svfmVvQ1V OI6U+shpwbsRH3e/7Q4rgSl6KreP0beE6+G8nEVU8k5KERszvnGSZ8KKpDo2N5JxWbn4 7J0wv1Uml6dvK8vencnQ1gYtiGAh+YTN+XJDV5TSILcoUfmxtcUjqZTZp7tIa2tm5Kae JFe/gYZaJL4lJ959hGwbZQ6j+BatXXXrSqc4iwDGAiEa2T6o3D2emaccTMe/P+UWW2d9 6sg3tHT0gLS3O+4gzcIxzfcHG6KkQKU1X9MjuCbmDjmTB+alYxV391Q6Lgz2w6TR6gqy 8Ujg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697118280; x=1697723080; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=++BNR3CLM1Hqkl3ibmZEgetPNeFTdnn0TXTRaeDafCU=; b=iERcbQMoPufI83cDe7zLGnB2GEiD12xMcuUgtLr1RijpC65WbeqS4lef++TI+AK4MH d1IWW9zjVLda2lyg+KJaI4Ay86yzRqPPb9sLLMNPP8DKHckFCTfpsZBUZuZ8jZSt706B NxG+AiqDKDGTXyvHK0icGo9SRnoqkHsK+dskNMrxxSImDND6MF/VZCm4s8mv5wADmc1V fkAYsPgmHjZjMV6LvqiDNOTan91nI37DUpkmkPUQ/j0pSq+fueJdwDD3bFFgNJqegUNd InARENaqs83pU7jweJzvGiaUXtrn++LOR2HJPDZx9N/tEsZLqWTewAhy96o86o1xL+uf 2N+A== X-Gm-Message-State: AOJu0YwUQiJi/2E4l/A5P9/JCGQdTx7cjOUuMD5K6CFaygXcxC6EvQht txdk5WoIG6zJe3A9sglqTWE= X-Google-Smtp-Source: AGHT+IF3GSrFErLJaSsB/NrY9ljP5+T1+2/K0AyXfIeRRhjP3+KZZDJaa2qzKOW+7pCqTdRySLu0Rw== X-Received: by 2002:a5d:5103:0:b0:31f:b138:5a0 with SMTP id s3-20020a5d5103000000b0031fb13805a0mr20030683wrt.48.1697118279593; Thu, 12 Oct 2023 06:44:39 -0700 (PDT) Received: from amir-ThinkPad-T480.lan ([5.29.249.86]) by smtp.gmail.com with ESMTPSA id l16-20020a7bc450000000b0040536dcec17sm21825154wmi.27.2023.10.12.06.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 06:44:38 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi , Christian Brauner Cc: linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 1/2] fs: factor out vfs_parse_monolithic_sep() helper Date: Thu, 12 Oct 2023 16:44:27 +0300 Message-Id: <20231012134428.1874373-2-amir73il@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231012134428.1874373-1-amir73il@gmail.com> References: <20231012134428.1874373-1-amir73il@gmail.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Factor out vfs_parse_monolithic_sep() from generic_parse_monolithic(), so filesystems could use it with a custom option separator callback. Signed-off-by: Amir Goldstein Acked-by: Christian Brauner --- Christian, If you can ack this patch, I'd rather send it to Linus for 6.6-rc6, along with the two ovl option parsing fixes. I checked that it does not conflict with any code on vfs.all OTM. Thanks, Amir. fs/fs_context.c | 34 +++++++++++++++++++++++++++++----- include/linux/fs_context.h | 2 ++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/fs/fs_context.c b/fs/fs_context.c index a0ad7a0c4680..98589aae5208 100644 --- a/fs/fs_context.c +++ b/fs/fs_context.c @@ -192,17 +192,19 @@ int vfs_parse_fs_string(struct fs_context *fc, const char *key, EXPORT_SYMBOL(vfs_parse_fs_string); /** - * generic_parse_monolithic - Parse key[=val][,key[=val]]* mount data + * vfs_parse_monolithic_sep - Parse key[=val][,key[=val]]* mount data * @fc: The superblock configuration to fill in. * @data: The data to parse + * @sep: callback for separating next option * - * Parse a blob of data that's in key[=val][,key[=val]]* form. This can be - * called from the ->monolithic_mount_data() fs_context operation. + * Parse a blob of data that's in key[=val][,key[=val]]* form with a custom + * option separator callback. * * Returns 0 on success or the error returned by the ->parse_option() fs_context * operation on failure. */ -int generic_parse_monolithic(struct fs_context *fc, void *data) +int vfs_parse_monolithic_sep(struct fs_context *fc, void *data, + char *(*sep)(char **)) { char *options = data, *key; int ret = 0; @@ -214,7 +216,7 @@ int generic_parse_monolithic(struct fs_context *fc, void *data) if (ret) return ret; - while ((key = strsep(&options, ",")) != NULL) { + while ((key = sep(&options)) != NULL) { if (*key) { size_t v_len = 0; char *value = strchr(key, '='); @@ -233,6 +235,28 @@ int generic_parse_monolithic(struct fs_context *fc, void *data) return ret; } +EXPORT_SYMBOL(vfs_parse_monolithic_sep); + +static char *vfs_parse_comma_sep(char **s) +{ + return strsep(s, ","); +} + +/** + * generic_parse_monolithic - Parse key[=val][,key[=val]]* mount data + * @fc: The superblock configuration to fill in. + * @data: The data to parse + * + * Parse a blob of data that's in key[=val][,key[=val]]* form. This can be + * called from the ->monolithic_mount_data() fs_context operation. + * + * Returns 0 on success or the error returned by the ->parse_option() fs_context + * operation on failure. + */ +int generic_parse_monolithic(struct fs_context *fc, void *data) +{ + return vfs_parse_monolithic_sep(fc, data, vfs_parse_comma_sep); +} EXPORT_SYMBOL(generic_parse_monolithic); /** diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h index 96332db693d5..c13e99cbbf81 100644 --- a/include/linux/fs_context.h +++ b/include/linux/fs_context.h @@ -136,6 +136,8 @@ extern struct fs_context *vfs_dup_fs_context(struct fs_context *fc); extern int vfs_parse_fs_param(struct fs_context *fc, struct fs_parameter *param); extern int vfs_parse_fs_string(struct fs_context *fc, const char *key, const char *value, size_t v_size); +int vfs_parse_monolithic_sep(struct fs_context *fc, void *data, + char *(*sep)(char **)); extern int generic_parse_monolithic(struct fs_context *fc, void *data); extern int vfs_get_tree(struct fs_context *fc); extern void put_fs_context(struct fs_context *fc); From patchwork Thu Oct 12 13:44:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 13419289 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6833E2AB5E for ; Thu, 12 Oct 2023 13:44:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="E6GinkgZ" Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9B4ED7; Thu, 12 Oct 2023 06:44:43 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40537481094so10697345e9.0; Thu, 12 Oct 2023 06:44:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697118282; x=1697723082; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DQBIk69QFlbYTxAs2STa0KR4A9RGxwDTRGPJubc9nJ4=; b=E6GinkgZPzeczG07I+feQqQIQ7IwUWcfnd057I7Oxvc2//yBhcTgm4Qf8y9g/LpSZU HTHszTT6MuPevbVBR2R70eBYQjtlNgG2t2HQTw0j9s8sIyrgGCHYAddExFg8K3mlFjaO INEKu6igmU2yqyTq1UzQAo7qsufa3zbQP7EuB40IBS5syFRfrgs/N4ZpYWVyeJvXRXjV 0TI3kgSQmBlw1ethQR9p9I5gy9nlg+3uS+TX/GKaALWCSZ0NKt0LMCsOZyh0wMeCWMhx d3UtXx7ZyC+TTLkvvGYczNuwvqcbgr6jpwstjFcJcq7WQ8rREYOpctc1r9i1cJiH9wdb qrTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697118282; x=1697723082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DQBIk69QFlbYTxAs2STa0KR4A9RGxwDTRGPJubc9nJ4=; b=tkc1dwxNtClo4k2AmD26bEefcL7A80NyCZDC8M4ysKZjJlrU6lk3U4r8Bp+DrCIlhz 2vLslrZgrlt8OUYdxBfo9srKaMQqRrxQ/LSt/j8x/ozklmZf5OjcUnmpKxfuynDPG+Jt YjIvIx/mmrTaAa9Lbi9dg3/fGnwriqRAKtjQ7plI4ervQB/U5dxxZI2sH0p/jIpG8b2j B1RFekcx0vfm6HlGIHI9ehpN0fLHJ/pegdmYw6QzGNK2UbFC9V1waUB/E2UpoKUegBmi UsKSB27qneFG9skWMeioXa1TUo8yzoOU7ZBn9iKa2fKJ3/9Vgcs3kfe2MPQuTCe74e1x 7Mlw== X-Gm-Message-State: AOJu0YzR0eCPCxwzTgMSmd2LGd0VnCdwOPXnkncN3nuQse6ld75YwwPy CMLpU1LJzIeyrRqY64Mo1CE= X-Google-Smtp-Source: AGHT+IHI37fY8uctORu9YjDOzbiUG8s7M62XR4ULQtja972FEF7f0QIcY07k+0FnFqQqw4yXWMSSmQ== X-Received: by 2002:a1c:7c0b:0:b0:402:8896:bb7b with SMTP id x11-20020a1c7c0b000000b004028896bb7bmr20213613wmc.6.1697118281986; Thu, 12 Oct 2023 06:44:41 -0700 (PDT) Received: from amir-ThinkPad-T480.lan ([5.29.249.86]) by smtp.gmail.com with ESMTPSA id l16-20020a7bc450000000b0040536dcec17sm21825154wmi.27.2023.10.12.06.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 06:44:40 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi , Christian Brauner Cc: linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Ryan Hendrickson Subject: [PATCH 2/2] ovl: fix regression in parsing of mount options with esacped comma Date: Thu, 12 Oct 2023 16:44:28 +0300 Message-Id: <20231012134428.1874373-3-amir73il@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231012134428.1874373-1-amir73il@gmail.com> References: <20231012134428.1874373-1-amir73il@gmail.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Ever since commit 91c77947133f ("ovl: allow filenames with comma"), the following example was legit overlayfs mount options: mount -t overlay overlay -o 'lowerdir=/tmp/a\,b/lower' /mnt The conversion to new mount api moved to using the common helper generic_parse_monolithic() and discarded the specialized ovl_next_opt() option separator. Bring back ovl_next_opt() and use vfs_parse_monolithic_sep() to fix the regression. Reported-by: Ryan Hendrickson Closes: https://lore.kernel.org/r/8da307fb-9318-cf78-8a27-ba5c5a0aef6d@alum.mit.edu/ Fixes: 1784fbc2ed9c ("ovl: port to new mount api") Signed-off-by: Amir Goldstein --- fs/overlayfs/params.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c index 1429767a84bc..c2c3820b86f2 100644 --- a/fs/overlayfs/params.c +++ b/fs/overlayfs/params.c @@ -157,6 +157,34 @@ const struct fs_parameter_spec ovl_parameter_spec[] = { {} }; +static char *ovl_next_opt(char **s) +{ + char *sbegin = *s; + char *p; + + if (sbegin == NULL) + return NULL; + + for (p = sbegin; *p; p++) { + if (*p == '\\') { + p++; + if (!*p) + break; + } else if (*p == ',') { + *p = '\0'; + *s = p + 1; + return sbegin; + } + } + *s = NULL; + return sbegin; +} + +static int ovl_parse_monolithic(struct fs_context *fc, void *data) +{ + return vfs_parse_monolithic_sep(fc, data, ovl_next_opt); +} + static ssize_t ovl_parse_param_split_lowerdirs(char *str) { ssize_t nr_layers = 1, nr_colons = 0; @@ -683,6 +711,7 @@ static int ovl_reconfigure(struct fs_context *fc) } static const struct fs_context_operations ovl_context_ops = { + .parse_monolithic = ovl_parse_monolithic, .parse_param = ovl_parse_param, .get_tree = ovl_get_tree, .reconfigure = ovl_reconfigure,