| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <f9224687-ce0c-b41b-f158-1b679a70c2d5@rasmusvillemoes.dk>
Date: Tue, 21 Jun 2022 09:04:38 +0200
From: Rasmus Villemoes <linux@...musvillemoes.dk>
To: Kent Overstreet <kent.overstreet@...il.com>,
linux-kernel@...r.kernel.org, linux-mm@...ck.org, pmladek@...e.com
Cc: rostedt@...dmis.org, enozhatsky@...omium.org, willy@...radead.org
Subject: Re: [PATCH v4 05/34] vsprintf: %pf(%p)
On 20/06/2022 02.42, Kent Overstreet wrote:
> This implements two new format strings: both do the same thing, one more
> compatible with current gcc format string checking, the other that we'd
> like to standardize:
>
> %pf(%p) - more compatible
> %(%p) - more prettier
No.
> diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst
> index 5e89497ba3..8fc0b62af1 100644
> --- a/Documentation/core-api/printk-formats.rst
> +++ b/Documentation/core-api/printk-formats.rst
> @@ -625,6 +625,28 @@ Examples::
> %p4cc Y10 little-endian (0x20303159)
> %p4cc NV12 big-endian (0xb231564e)
>
> +Calling a pretty printer function
> +---------------------------------
> +
> +::
> +
> + %pf(%p) pretty printer function taking one argument
> + %pf(%p,%p) pretty printer function taking two arguments
> +
> +For calling generic pretty printers. A pretty printer is a function that takes
> +as its first argument a pointer to a printbuf, and then zero or more additional
> +pointer arguments. For example:
> +
> + void foo_to_text(struct printbuf *out, struct foo *foo)
> + {
> + pr_buf(out, "bar=%u baz=%u", foo->bar, foo->baz);
> + }
> +
> + printf("%pf(%p)", foo_to_text, foo);
> +
> +Note that a pretty-printer may not sleep, if called from printk(). If called
> +from pr_buf() or sprintf() there are no such restrictions.
I know what you're trying to say, but if the sprintf() call itself is
from a non-sleepable context this is obviously not true. So please just
make the rule "A pretty-printer must not sleep.". That's much simpler
and less error-prone. Otherwise I guarantee you that somebody is going
to add a sleeping pretty-printer for their own need, use it in a couple
of safe places, and then somebody wants to add a printk() in that driver
and sees "hey, I can get all this state dumped very easily with this
pretty-printer".
> diff --git a/lib/vsprintf.c b/lib/vsprintf.c
> index 7b24714674..5afa74dda5 100644
> --- a/lib/vsprintf.c
> +++ b/lib/vsprintf.c
> @@ -436,7 +436,8 @@ enum format_type {
> FORMAT_TYPE_UINT,
> FORMAT_TYPE_INT,
> FORMAT_TYPE_SIZE_T,
> - FORMAT_TYPE_PTRDIFF
> + FORMAT_TYPE_PTRDIFF,
> + FORMAT_TYPE_FN,
> };
>
> struct printf_spec {
> @@ -2520,7 +2521,16 @@ int format_decode(const char *fmt, struct printf_spec *spec)
> return ++fmt - start;
>
> case 'p':
> - spec->type = FORMAT_TYPE_PTR;
> + fmt++;
> + if (fmt[0] == 'f' &&
> + fmt[1] == '(') {
> + fmt += 2;
> + spec->type = FORMAT_TYPE_FN;
> + } else
> + spec->type = FORMAT_TYPE_PTR;
> + return fmt - start;
> + case '(':
> + spec->type = FORMAT_TYPE_FN;
> return ++fmt - start;
NAK. Don't implement something that will never be tested nor used.
There's not a snowball's chance in hell that we'll ever build the kernel
without -Wformat.
>
> +static void call_prt_fn(struct printbuf *out, void *fn, void **fn_args, unsigned nr_args)
> +{
> + typedef void (*printf_fn_0)(struct printbuf *);
> + typedef void (*printf_fn_1)(struct printbuf *, void *);
> + typedef void (*printf_fn_2)(struct printbuf *, void *, void *);
> + typedef void (*printf_fn_3)(struct printbuf *, void *, void *, void *);
> + typedef void (*printf_fn_4)(struct printbuf *, void *, void *, void *, void *);
> + typedef void (*printf_fn_5)(struct printbuf *, void *, void *, void *, void *, void *);
> + typedef void (*printf_fn_6)(struct printbuf *, void *, void *, void *, void *, void *, void *);
> + typedef void (*printf_fn_7)(struct printbuf *, void *, void *, void *, void *, void *, void *, void *);
> + typedef void (*printf_fn_8)(struct printbuf *, void *, void *, void *, void *, void *, void *, void *, void *);
Sorry, but this is way too ugly, and the prospect of at some point in
the future invoking libffi to do something even naster... eww. We do not
need more functions with completely generic prototypes with no
typechecking and making it extremely hard to teach one of our static
analyzers (smatch has some %pX checking) to do that typechecking.
There are at least two ways you can achieve this passing of a variable
number of arguments with proper types.
(1) Each pretty-printer comes with a struct wrapping up its real
arguments and a macro for creating a compound literal passing those
arguments.
struct foo_pp {
void (*func)(struct printbuf *pb, void *ctx); /* always first */
int x;
long y;
};
void foo_pp(struct printbuf *pb, void *ctx)
{
struct foo_pp *f = ctx;
pr_printf(pb, "%d %ld", f->x, f->y);
}
#define FOO_PP(_x, _y) (struct foo_pp){.func = foo_pp, .x = (_x), .y = (_y)}
printk("bla bla %pf\n", &FOO_PP(aa, bb));
(2) Let the pretty-printer itself extract the varargs it expects. To
portably pass around a va_list by reference it needs to be wrapped, so
this would be
struct wva { va_list ap; };
void foo_pp(struct printbuf *pb, struct wva *w)
{
int x = va_arg(w->ap, int);
long y = va_arg(w->ap, long);
pr_printf(pb, "%d %ld", x, y);
}
printk("bla bla %pf(%d, %ld)\n", foo_pp, aa, bb)
with the core printf implementation internally using such a wrapped
va_list, and after a %pf( relying on the pretty-printer having consumed
the arguments up until the closing ). It would probably be a good idea
to give the pretty-printer a pointer to that opening '(' or one-past-it
as well so it could do a sanity check.
So the "core" implementation would be (or the printbuf version of the same)
wsnprintf(char *buf, size_t len, const char *fmt, struct wva *w)
{ ... }
while e.g. snprintf and vsnprintf would be
snprintf(char *buf, size_t len, const char *fmt, ...)
{
struct wva w;
int ret;
va_start(w.ap, fmt);
ret = wsnprintf(buf, len, fmt, &w);
va_end(w.ap);
return ret;
}
vsnprintf(char *buf, size_t len, const char *fmt, struct va_list ap)
{
struct wva w;
int ret;
va_copy(w.ap, ap);
ret = wsnprintf(buf, len, fmt, &w);
va_end(w.ap);
return ret;
}
[snprintf could as usual be implemented in terms of vsnprintf, but the
above would eliminate the state copying].
Rasmus
Powered by blists - more mailing lists