From: Denis Efremov <efremov@linux.com>
To: Joe Perches <joe@perches.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>
Cc: Kees Cook <keescook@chromium.org>,
"Gustavo A . R . Silva" <gustavoars@kernel.org>,
Julia Lawall <julia.lawall@inria.fr>,
Alex Dewar <alex.dewar90@gmail.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] sysfs: Add sysfs_emit to replace sprintf to PAGE_SIZE buffers.
Date: Sat, 29 Aug 2020 09:59:08 +0300 [thread overview]
Message-ID: <c77e83a0-7587-3e07-81cb-6b185d1ce6aa@linux.com> (raw)
In-Reply-To: <a96cdf07cd136d06c3cc1e10eb884caa7498ba72.1598654887.git.joe@perches.com>
Hi,
On 8/29/20 1:52 AM, Joe Perches wrote:
> sprintf does not know the PAGE_SIZE maximum of the temporary buffer
> used for outputting sysfs content requests and it's possible to
> overrun the buffer length.
>
> Add a generic sysfs_emit mechanism that knows that the size of the
> temporary buffer and ensures that no overrun is done.
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
It could be a good idea to update the docs to, i.e.:
https://www.kernel.org/doc/html/latest/filesystems/sysfs.html
> fs/sysfs/file.c | 30 ++++++++++++++++++++++++++++++
> include/linux/sysfs.h | 8 ++++++++
> 2 files changed, 38 insertions(+)
>
> diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
> index eb6897ab78e7..06a13bbd7080 100644
> --- a/fs/sysfs/file.c
> +++ b/fs/sysfs/file.c
> @@ -707,3 +707,33 @@ int sysfs_change_owner(struct kobject *kobj, kuid_t kuid, kgid_t kgid)
> return 0;
> }
> EXPORT_SYMBOL_GPL(sysfs_change_owner);
> +
> +/**
> + * sysfs_emit - scnprintf equivalent, aware of PAGE_SIZE buffer.
> + * @buf: start of PAGE_SIZE buffer.
> + * @pos: current position in buffer
> + * (pos - buf) must always be < PAGE_SIZE
> + * @fmt: format
> + * @...: arguments to format
> + *
> + *
> + * Returns number of characters written at pos.
> + */
> +int sysfs_emit(char *buf, char *pos, const char *fmt, ...)
> +{
> + va_list args;
> + bool bad_pos = pos < buf;
> + bool bad_len = (pos - buf) >= PAGE_SIZE;
> + int len;
> +
> + if (WARN(bad_pos || bad_len, "(pos < buf):%d (pos >= PAGE_SIZE):%d\n",
> + bad_pos, bad_len))
> + return 0;
> +
> + va_start(args, fmt);
> + len = vscnprintf(pos, PAGE_SIZE - (pos - buf), fmt, args);
> + va_end(args);
> +
> + return len;
> +}
> +EXPORT_SYMBOL_GPL(sysfs_emit);
> diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
> index 34e84122f635..5a21d3d30016 100644
> --- a/include/linux/sysfs.h
> +++ b/include/linux/sysfs.h
> @@ -329,6 +329,8 @@ int sysfs_groups_change_owner(struct kobject *kobj,
> int sysfs_group_change_owner(struct kobject *kobj,
> const struct attribute_group *groups, kuid_t kuid,
> kgid_t kgid);
> +__printf(3, 4)
> +int sysfs_emit(char *buf, char *pos, const char *fmt, ...);
>
> #else /* CONFIG_SYSFS */
>
> @@ -576,6 +578,12 @@ static inline int sysfs_group_change_owner(struct kobject *kobj,
> return 0;
> }
>
> +__printf(3, 4)
> +static inline int sysfs_emit(char *buf, char *pos, const char *fmt, ...)
> +{
> + return 0;
> +}
> +
> #endif /* CONFIG_SYSFS */
>
> static inline int __must_check sysfs_create_file(struct kobject *kobj,
>
Thanks,
Denis
next prev parent reply other threads:[~2020-08-29 6:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-28 22:52 [PATCH] sysfs: Add sysfs_emit to replace sprintf to PAGE_SIZE buffers Joe Perches
2020-08-29 6:22 ` Greg Kroah-Hartman
2020-08-29 6:41 ` Joe Perches
2020-08-29 6:51 ` Greg Kroah-Hartman
2020-08-29 6:59 ` Denis Efremov [this message]
2020-08-29 7:13 ` Joe Perches
2020-08-29 21:53 ` Denis Efremov
2020-08-29 23:49 ` Joe Perches
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=c77e83a0-7587-3e07-81cb-6b185d1ce6aa@linux.com \
--to=efremov@linux.com \
--cc=alex.dewar90@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavoars@kernel.org \
--cc=joe@perches.com \
--cc=julia.lawall@inria.fr \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@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;
as well as URLs for NNTP newsgroup(s).