The patch titled Subject: seq_file: introduce seq_escape_mem() has been added to the -mm tree. Its filename is seq_file-introduce-seq_escape_mem.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/seq_file-introduce-seq_escape_mem.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/seq_file-introduce-seq_escape_mem.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Subject: seq_file: introduce seq_escape_mem() Introduce seq_escape_mem() to allow users to pass additional parameters to string_escape_mem(). Link: https://lkml.kernel.org/r/20210504180819.73127-12-andriy.shevchenko@xxxxxxxxxxxxxxx Suggested-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Cc: Chuck Lever <chuck.lever@xxxxxxxxxx> Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/seq_file.c | 25 +++++++++++++++++++++++++ include/linux/seq_file.h | 2 ++ 2 files changed, 27 insertions(+) --- a/fs/seq_file.c~seq_file-introduce-seq_escape_mem +++ a/fs/seq_file.c @@ -356,6 +356,31 @@ int seq_release(struct inode *inode, str EXPORT_SYMBOL(seq_release); /** + * seq_escape_mem - print data into buffer, escaping some characters + * @m: target buffer + * @src: source buffer + * @len: size of source buffer + * @flags: flags to pass to string_escape_mem() + * @esc: set of characters that need escaping + * + * Puts data into buffer, replacing each occurrence of character from + * given class (defined by @flags and @esc) with printable escaped sequence. + * + * Use seq_has_overflowed() to check for errors. + */ +void seq_escape_mem(struct seq_file *m, const char *src, size_t len, + unsigned int flags, const char *esc) +{ + char *buf; + size_t size = seq_get_buf(m, &buf); + int ret; + + ret = string_escape_mem(src, len, buf, size, flags, esc); + seq_commit(m, ret < size ? ret : -1); +} +EXPORT_SYMBOL(seq_escape_mem); + +/** * seq_escape - print string into buffer, escaping some characters * @m: target buffer * @s: string --- a/include/linux/seq_file.h~seq_file-introduce-seq_escape_mem +++ a/include/linux/seq_file.h @@ -126,6 +126,8 @@ void seq_put_decimal_ll(struct seq_file void seq_put_hex_ll(struct seq_file *m, const char *delimiter, unsigned long long v, unsigned int width); +void seq_escape_mem(struct seq_file *m, const char *src, size_t len, + unsigned int flags, const char *esc); void seq_escape(struct seq_file *m, const char *s, const char *esc); void seq_escape_mem_ascii(struct seq_file *m, const char *src, size_t isz); _ Patches currently in -mm which might be from andriy.shevchenko@xxxxxxxxxxxxxxx are lib-string_helpers-switch-to-use-bit-macro.patch lib-string_helpers-move-escape_np-check-inside-else-branch-in-a-loop.patch lib-string_helpers-drop-indentation-level-in-string_escape_mem.patch lib-string_helpers-introduce-escape_na-for-escaping-non-ascii.patch lib-string_helpers-introduce-escape_nap-to-escape-non-ascii-and-non-printable.patch lib-string_helpers-allow-to-append-additional-characters-to-be-escaped.patch lib-test-string_helpers-print-flags-in-hexadecimal-format.patch lib-test-string_helpers-get-rid-of-trailing-comma-in-terminators.patch lib-test-string_helpers-add-test-cases-for-new-features.patch maintainers-add-myself-as-designated-reviewer-for-generic-string-library.patch seq_file-introduce-seq_escape_mem.patch seq_file-add-seq_escape_str-as-replica-of-string_escape_str.patch seq_file-convert-seq_escape-to-use-seq_escape_str.patch nfsd-avoid-non-flexible-api-in-seq_quote_mem.patch seq_file-drop-unused-_escape_mem_ascii.patch