From: Mohammed Anees <pvmohammedanees2003@gmail.com>
To: Alasdair Kergon <agk@redhat.com>,
Mike Snitzer <snitzer@kernel.org>,
Mikulas Patocka <mpatocka@redhat.com>
Cc: dm-devel@lists.linux.dev, linux-kernel@vger.kernel.org,
Mohammed Anees <pvmohammedanees2003@gmail.com>
Subject: [PATCH] dm: Allow the use of escaped characters in str_field_delimit()
Date: Tue, 12 Nov 2024 23:27:58 +0530 [thread overview]
Message-ID: <20241112175758.114080-1-pvmohammedanees2003@gmail.com> (raw)
Escape characters were not handled before, which could lead to
unwanted issues. Some device-mapper names may contain backslashes (`\`)
as valid characters and should not be treated as escape characters. Only
escape characters followed directly by the separator are considered
valid and need to be processed. After handling, the escape characters
are removed to ensure the final string is correctly parsed without
unwanted escape sequences which were used only for escaping.
Signed-off-by: Mohammed Anees <pvmohammedanees2003@gmail.com>
---
drivers/md/dm-init.c | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/drivers/md/dm-init.c b/drivers/md/dm-init.c
index b37bbe762500..dad9d523f7fb 100644
--- a/drivers/md/dm-init.c
+++ b/drivers/md/dm-init.c
@@ -88,13 +88,33 @@ static void __init dm_setup_cleanup(struct list_head *devices)
static char __init *str_field_delimit(char **str, char separator)
{
char *s;
+ /* This variable handles removing escape characters, which are
+ * only used to avoid the separator and aren't needed in the
+ * final string.
+ */
+ char *write;
- /* TODO: add support for escaped characters */
*str = skip_spaces(*str);
- s = strchr(*str, separator);
+ s = *str;
+ write = *str;
+
+ /* Find the separator and handle escape character */
+ while (*s) {
+ /* If '\' is followed by the separator, skip '\' by
+ * incrementing s, write will then overwrite the
+ * escape character with the separator.
+ */
+ if (*s == '\\' && *(s + 1) != '\0' && *(s + 1) == separator)
+ s++;
+ else if (*s == separator)
+ break;
+
+ *write++ = *s++;
+ }
+
/* Delimit the field and remove trailing spaces */
- if (s)
- *s = '\0';
+ if (write)
+ *write = '\0';
*str = strim(*str);
return s ? ++s : NULL;
}
--
2.47.0
next reply other threads:[~2024-11-12 18:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-12 17:57 Mohammed Anees [this message]
2024-11-13 10:39 ` [PATCH] dm: Allow the use of escaped characters in str_field_delimit() Zdenek Kabelac
2024-11-18 10:38 ` Mikulas Patocka
2024-12-10 16:25 ` Mike Snitzer
2024-12-15 10:13 ` Mohammed Anees
2025-01-03 16:21 ` Mikulas Patocka
2025-01-06 21:27 ` Mike Snitzer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241112175758.114080-1-pvmohammedanees2003@gmail.com \
--to=pvmohammedanees2003@gmail.com \
--cc=agk@redhat.com \
--cc=dm-devel@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=mpatocka@redhat.com \
--cc=snitzer@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox