| 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: <1379459317-13046-6-git-send-email-daniel.santos@pobox.com>
Date: Tue, 17 Sep 2013 18:08:37 -0500
From: danielfsantos@....net
To: linux-kbuild <linux-kbuild@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>,
Michal Marek <mmarek@...e.cz>,
Andrew Morton <akpm@...ux-foundation.org>,
"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>,
David Howells <dhowells@...hat.com>,
Thomas Gleixner <tglx@...utronix.de>,
Michael Kerrisk <mtk.manpages@...il.com>,
Dave Hansen <dave.hansen@...ux.intel.com>,
George Spelvin <linux@...izon.com>
Cc: Daniel Santos <daniel.santos@...ox.com>
Subject: [PATCH 5/5] lib: Add error string support to printks
This adds an extension for the integral format specifier suffix of 'e',
so that the format %[duxXo]e will result in printing an number (as
before) in addition to a name and descrption for an error code, if such
support is enabled and a name and descrption is found.
My initial thought was to use the glibc extension of '%m', but this
format specifier uses the value of libc's errno and adding a value
breaks gcc's printf parsing. I'm not convinced that the 'e' extension
is optimal, although there are only four instances of this pattern in
the kernel that would need to be changed.
git grep -E '".*%[#0\ +\-]*[0-9]*[hljzt]*[idoxXu]e'
Alternatively, 'E' was another thought for a suffix as well.
Signed-off-by: Daniel Santos <daniel.santos@...ox.com>
---
lib/vsprintf.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 26559bd..d96d675 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -345,6 +345,12 @@ int num_to_str(char *buf, int size, unsigned long long num)
#define SMALL 32 /* use lowercase in hex (must be 32 == 0x20) */
#define SPECIAL 64 /* prefix hex with "0x", octal with "0" */
+#if defined(CONFIG_PRINTK_ERROR_NAMES) || defined(CONFIG_PRINTK_ERROR_DESCS)
+# define ERROR 128 /* error name and/or descrption */
+#else
+# define ERROR 0
+#endif
+
enum format_type {
FORMAT_TYPE_NONE, /* Just a string part */
FORMAT_TYPE_WIDTH,
@@ -1346,6 +1352,75 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
return number(buf, end, (unsigned long) ptr, spec);
}
+/**
+ * error - format an error code into a descrption
+ *
+ * Basically, we print the number, name and descrption, but only if enabled.
+ * If there is no string for an error number, it's printed as if the option is
+ * disabled. The format is basically equivalent to:
+ *
+ * printk("%d (%s: %s)", num, name, descrption);
+ *
+ * If there's no descrption, it would end up like:
+ *
+ * printk("%d (%s)", num, name);
+ *
+ * etc.
+ *
+ * Note that we ignore width and precision here, although they are applied to
+ * the numerical portion of the output in number().
+ *
+ * Since we're initializing desc to NULL and then only setting it based upon
+ * a pre-compiler constant value, all code expecting it to be non-zero should
+ * compile-out when CONFIG_PRINTK_ERROR_DESCS is not enabled.
+ */
+#if defined(CONFIG_PRINTK_ERROR_NAMES) || defined(CONFIG_PRINTK_ERROR_DESCS)
+static noinline_for_stack
+char *error(char *buf, char *end, int err, struct printf_spec spec)
+{
+ const char *name = strerror_name(err);
+ const char *desc = NULL;
+
+#if defined(CONFIG_PRINTK_ERROR_DESCS)
+ desc = strerror(err);
+#endif
+
+ if (!(name || desc))
+ return buf;
+
+ if (&buf[1] < end) {
+ *buf++ = ' ';
+ *buf++ = '(';
+ }
+
+ if (name)
+ while (buf < end && *name)
+ *buf++ = *name++;
+
+ if (desc) {
+ if (name && &buf[1] < end) {
+ *buf++ = ':';
+ *buf++ = ' ';
+ }
+
+ while (buf < end && *desc)
+ *buf++ = *desc++;
+ }
+
+ if (buf < end)
+ *buf++ = ')';
+
+ return buf;
+}
+#else
+static inline
+char *error(char *buf, char *end, int err, struct printf_spec spec)
+{
+ return buf;
+}
+#endif /* CONFIG_PRINTK_ERROR_NAMES || CONFIG_PRINTK_ERROR_DESCS */
+
+
/*
* Helper function to decode printf style format.
* Each call decode a token from the format and return the
@@ -1501,12 +1576,20 @@ qualifier:
case 'X':
spec->base = 16;
+ if (fmt[1] == 'e') {
+ spec->flags |= ERROR;
+ ++fmt;
+ }
break;
case 'd':
case 'i':
spec->flags |= SIGN;
case 'u':
+ if (fmt[1] == 'e') {
+ spec->flags |= ERROR;
+ ++fmt;
+ }
break;
default:
@@ -1577,6 +1660,9 @@ qualifier:
* %*ph[CDN] a variable-length hex string with a separator (supports up to 64
* bytes of the input)
* %n is ignored
+ * %[idxXu]e will print the name of error code, if one exists. If the number
+ * doesn't match a known error code, it is printed as a normal signed int.
+ * TODO: explain CONFIG_PRINTK_ERROR*
*
* ** Please update Documentation/printk-formats.txt when making changes **
*
@@ -1738,6 +1824,9 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
}
str = number(str, end, num, spec);
+
+ if (spec.flags & ERROR)
+ str = error(str, end, num, spec);
}
}
@@ -2185,6 +2274,9 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
}
str = number(str, end, num, spec);
+
+ if (spec.flags & ERROR)
+ str = error(str, end, num, spec);
} /* default: */
} /* switch(spec.type) */
} /* while(*fmt) */
--
1.8.1.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists