From: Petr Mladek <pmladek@suse.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
"Tobin C . Harding" <me@tobin.cc>, Joe Perches <joe@perches.com>,
Andrew Morton <akpm@linux-foundation.org>,
Michal Hocko <mhocko@suse.cz>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
linux-kernel@vger.kernel.org, Petr Mladek <pmladek@suse.com>
Subject: [PATCH v6 4/9] vsprintf: Factor out %p[iI] handler as ip_addr_string()
Date: Fri, 8 Feb 2019 16:23:05 +0100 [thread overview]
Message-ID: <20190208152310.29531-5-pmladek@suse.com> (raw)
In-Reply-To: <20190208152310.29531-1-pmladek@suse.com>
Move the non-trivial code from the long pointer() function. We are going
to improve error handling that will make it even more complicated.
This patch does not change the existing behavior.
Signed-off-by: Petr Mladek <pmladek@suse.com>
---
lib/vsprintf.c | 52 ++++++++++++++++++++++++++++++----------------------
1 file changed, 30 insertions(+), 22 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 0b6209854f5c..d8bc3bb8ce18 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1431,6 +1431,35 @@ char *ip4_addr_string_sa(char *buf, char *end, const struct sockaddr_in *sa,
}
static noinline_for_stack
+char *ip_addr_string(char *buf, char *end, const void *ptr,
+ struct printf_spec spec, const char *fmt)
+{
+ switch (fmt[1]) {
+ case '6':
+ return ip6_addr_string(buf, end, ptr, spec, fmt);
+ case '4':
+ return ip4_addr_string(buf, end, ptr, spec, fmt);
+ case 'S': {
+ const union {
+ struct sockaddr raw;
+ struct sockaddr_in v4;
+ struct sockaddr_in6 v6;
+ } *sa = ptr;
+
+ switch (sa->raw.sa_family) {
+ case AF_INET:
+ return ip4_addr_string_sa(buf, end, &sa->v4, spec, fmt);
+ case AF_INET6:
+ return ip6_addr_string_sa(buf, end, &sa->v6, spec, fmt);
+ default:
+ return string_nocheck(buf, end, "(invalid address)", spec);
+ }}
+ }
+
+ return ptr_to_id(buf, end, ptr, spec);
+}
+
+static noinline_for_stack
char *escaped_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
const char *fmt)
{
@@ -2011,28 +2040,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
* 4: 001.002.003.004
* 6: 000102...0f
*/
- switch (fmt[1]) {
- case '6':
- return ip6_addr_string(buf, end, ptr, spec, fmt);
- case '4':
- return ip4_addr_string(buf, end, ptr, spec, fmt);
- case 'S': {
- const union {
- struct sockaddr raw;
- struct sockaddr_in v4;
- struct sockaddr_in6 v6;
- } *sa = ptr;
-
- switch (sa->raw.sa_family) {
- case AF_INET:
- return ip4_addr_string_sa(buf, end, &sa->v4, spec, fmt);
- case AF_INET6:
- return ip6_addr_string_sa(buf, end, &sa->v6, spec, fmt);
- default:
- return string_nocheck(buf, end, "(invalid address)", spec);
- }}
- }
- break;
+ return ip_addr_string(buf, end, ptr, spec, fmt);
case 'E':
return escaped_string(buf, end, ptr, spec, fmt);
case 'U':
--
2.13.7
next prev parent reply other threads:[~2019-02-08 15:24 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-08 15:23 [PATCH v6 0/9] vsprintf: Prevent silent crashes and consolidate error handling Petr Mladek
2019-02-08 15:23 ` [PATCH v6 1/9] vsprintf: Shuffle restricted_pointer() Petr Mladek
2019-02-08 15:23 ` [PATCH v6 2/9] vsprintf: Consistent %pK handling for kptr_restrict == 0 Petr Mladek
2019-02-08 15:23 ` [PATCH v6 3/9] vsprintf: Do not check address of well-known strings Petr Mladek
2019-02-08 17:27 ` Andy Shevchenko
2019-02-08 15:23 ` Petr Mladek [this message]
2019-02-08 15:23 ` [PATCH v6 5/9] vsprintf: Factor out %pV handler as va_format() Petr Mladek
2019-02-08 17:11 ` Joe Perches
2019-02-12 13:00 ` Petr Mladek
2019-02-12 14:32 ` Steven Rostedt
2019-02-12 17:58 ` Joe Perches
2019-02-12 19:47 ` Steven Rostedt
2019-02-12 20:22 ` Rasmus Villemoes
2019-02-08 15:23 ` [PATCH v6 6/9] vsprintf: Factor out %pO handler as kobject_string() Petr Mladek
2019-02-08 15:23 ` [PATCH v6 7/9] vsprintf: Consolidate handling of unknown pointer specifiers Petr Mladek
2019-02-08 17:25 ` Andy Shevchenko
2019-02-12 13:35 ` Petr Mladek
2019-02-08 15:23 ` [PATCH v6 8/9] vsprintf: Prevent crash when dereferencing invalid pointers Petr Mladek
2019-02-19 3:30 ` Sergey Senozhatsky
2019-02-19 11:02 ` Andy Shevchenko
2019-02-19 12:51 ` Sergey Senozhatsky
2019-02-19 13:49 ` Andy Shevchenko
2019-02-19 14:15 ` Sergey Senozhatsky
2019-02-20 10:24 ` Petr Mladek
2019-02-08 15:23 ` [PATCH v6 9/9] vsprintf: Avoid confusion between invalid address and value Petr Mladek
2019-02-08 17:27 ` Andy Shevchenko
2019-02-12 15:45 ` Petr Mladek
2019-02-13 13:54 ` Andy Shevchenko
2019-02-14 8:42 ` Petr Mladek
2019-02-14 12:45 ` Andy Shevchenko
2019-02-19 3:03 ` Sergey Senozhatsky
2019-02-19 11:06 ` Andy Shevchenko
2019-02-20 9:24 ` Petr Mladek
2019-02-21 1:47 ` Sergey Senozhatsky
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=20190208152310.29531-5-pmladek@suse.com \
--to=pmladek@suse.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=me@tobin.cc \
--cc=mhocko@suse.cz \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=sergey.senozhatsky@gmail.com \
--cc=torvalds@linux-foundation.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).