From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
To: kernel-hardening@lists.openwall.com
Cc: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Kees Cook <keescook@chromium.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>
Subject: [RFC 6/6] lib/test_printf.c: add a few fmtcheck() test cases
Date: Wed, 8 Nov 2017 23:30:20 +0100 [thread overview]
Message-ID: <20171108223020.24487-7-linux@rasmusvillemoes.dk> (raw)
In-Reply-To: <20171108223020.24487-1-linux@rasmusvillemoes.dk>
It should be trivial to add more test cases, once we figure out the
exact rules for being compatible or not. Perhaps we'll have to extend
the struct test with a flags element if we add flags that affect the
return value.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
lib/test_printf.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/lib/test_printf.c b/lib/test_printf.c
index 563f10e6876a..0c8490f3a9b3 100644
--- a/lib/test_printf.c
+++ b/lib/test_printf.c
@@ -483,6 +483,45 @@ test_pointer(void)
flags();
}
+static void __init
+test_fmtcheck(void)
+{
+ struct test { const char *fmt; const char *tmpl; };
+ static const struct test compatible[] __initconst = {
+ {"", ""},
+ {"wlan%d", "%d"},
+ {"aa%llxbb", "cc%Lxdd%%"},
+ };
+ static const struct test incompatible[] __initconst = {
+ {"a %d b %lx", "%d %x"},
+ {"%llo", "%Lx"},
+ };
+ unsigned i;
+ const struct test *t;
+ const char *ret;
+
+ for (i = 0; i < ARRAY_SIZE(compatible); ++i) {
+ total_tests++;
+ t = &compatible[i];
+ ret = _fmtcheck(t->fmt, t->tmpl, FMTCHECK_SILENT);
+ if (ret != t->fmt) {
+ failed_tests++;
+ pr_warn("'%s' and '%s' deemed incompatible by fmtcheck()",
+ t->fmt, t->tmpl);
+ }
+ }
+ for (i = 0; i < ARRAY_SIZE(incompatible); ++i) {
+ total_tests++;
+ t = &incompatible[i];
+ ret = _fmtcheck(t->fmt, t->tmpl, FMTCHECK_SILENT);
+ if (ret != t->tmpl) {
+ failed_tests++;
+ pr_warn("'%s' and '%s' deemed compatible by fmtcheck()",
+ t->fmt, t->tmpl);
+ }
+ }
+}
+
static int __init
test_printf_init(void)
{
@@ -496,6 +535,8 @@ test_printf_init(void)
test_string();
test_pointer();
+ test_fmtcheck();
+
kfree(alloced_buffer);
if (failed_tests == 0)
--
2.11.0
next prev parent reply other threads:[~2017-11-08 22:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-08 22:30 [RFC 0/6] some compile- and run-time format checking Rasmus Villemoes
2017-11-08 22:30 ` [RFC 1/6] plugins: implement format_template attribute Rasmus Villemoes
2017-11-08 22:30 ` [RFC 2/6] compiler.h: add __format_template Rasmus Villemoes
2017-11-08 22:30 ` [RFC 3/6] compiler.h: add __attribute__((format_arg)) shorthand Rasmus Villemoes
2017-11-08 22:30 ` [RFC 4/6] lib/vsprintf.c: add fmtcheck utility Rasmus Villemoes
2017-11-09 1:08 ` Kees Cook
2017-11-08 22:30 ` [RFC 5/6] kernel.h: implement fmtmatch() wrapper around fmtcheck() Rasmus Villemoes
2017-11-08 22:30 ` Rasmus Villemoes [this message]
2017-11-09 1:11 ` [RFC 0/6] some compile- and run-time format checking Kees Cook
2017-11-09 14:08 ` Rasmus Villemoes
2018-10-26 23:24 ` [RFC PATCH 0/7] runtime format string checking Rasmus Villemoes
2018-10-26 23:24 ` [RFC PATCH 1/7] compiler_attributes.h: add __attribute__((format_arg)) shorthand Rasmus Villemoes
2018-10-27 12:06 ` Miguel Ojeda
2018-10-29 10:20 ` Rasmus Villemoes
2018-10-29 19:17 ` Miguel Ojeda
2018-11-02 10:36 ` Miguel Ojeda
2018-11-02 10:43 ` Rasmus Villemoes
2019-01-09 10:57 ` Miguel Ojeda
2018-10-26 23:24 ` [RFC PATCH 2/7] lib/vsprintf.c: add fmtcheck utility Rasmus Villemoes
2018-10-26 23:24 ` [RFC PATCH 3/7] kernel.h: implement fmtmatch() wrapper around fmtcheck() Rasmus Villemoes
2018-10-26 23:24 ` [RFC PATCH 4/7] lib/test_printf.c: add a few fmtcheck() test cases Rasmus Villemoes
2018-10-26 23:24 ` [RFC PATCH 5/7] kernel/kthread.c: do runtime check of format string in kthread_create_on_cpu() Rasmus Villemoes
2018-10-26 23:24 ` [RFC PATCH 6/7] nfs: use fmtcheck() in root_nfs_data Rasmus Villemoes
2018-10-26 23:24 ` [RFC PATCH 7/7] drivers: hwmon: add runtime format string checking Rasmus Villemoes
2018-10-27 17:44 ` Guenter Roeck
2018-10-30 20:58 ` [RFC PATCH 0/7] " Kees Cook
2018-11-01 22:06 ` Rasmus Villemoes
2018-11-01 22:57 ` Kees Cook
2018-11-02 20:09 ` Rasmus Villemoes
2018-11-02 20:46 ` Kees Cook
2018-11-05 9:33 ` Rasmus Villemoes
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=20171108223020.24487-7-linux@rasmusvillemoes.dk \
--to=linux@rasmusvillemoes.dk \
--cc=akpm@linux-foundation.org \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-kernel@vger.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).