The patch titled
lib: fix scnprintf() if @size is == 0
has been added to the -mm tree. Its filename is
lib-fix-scnprintf-if-size-is-==-0.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: lib: fix scnprintf() if @size is == 0
From: Changli Gao <xiaosuo@xxxxxxxxx>
scnprintf() should return 0 if @size is == 0. Update the comment for it,
as @size is unsigned.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/vsprintf.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff -puN lib/vsprintf.c~lib-fix-scnprintf-if-size-is-==-0 lib/vsprintf.c
--- a/lib/vsprintf.c~lib-fix-scnprintf-if-size-is-==-0
+++ a/lib/vsprintf.c
@@ -1504,7 +1504,7 @@ EXPORT_SYMBOL(snprintf);
* @...: Arguments for the format string
*
* The return value is the number of characters written into @buf not including
- * the trailing '\0'. If @size is <= 0 the function returns 0.
+ * the trailing '\0'. If @size is == 0 the function returns 0.
*/
int scnprintf(char *buf, size_t size, const char *fmt, ...)
@@ -1516,7 +1516,11 @@ int scnprintf(char *buf, size_t size, co
i = vsnprintf(buf, size, fmt, args);
va_end(args);
- return (i >= size) ? (size - 1) : i;
+ if (likely(i < size))
+ return i;
+ if (size != 0)
+ return size - 1;
+ return 0;
}
EXPORT_SYMBOL(scnprintf);
_
Patches currently in -mm which might be from xiaosuo@xxxxxxxxx are
linux-next.patch
timer-initialize-the-field-slack-of-timer_list.patch
lib-fix-scnprintf-if-size-is-==-0.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
