linux-kernel - [PATCH v5 02/12][resend] vsprintf: pre-calculate final string length for later use

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <5687c764e200cd3a1c0a1ca7704265921e1362fb.1258181837.git.andre.goddard@gmail.com>
Date:	Thu,  3 Dec 2009 12:48:58 -0200
From:	André Goddard Rosa <andre.goddard@...il.com>
To:	"Andrew Morton" <akpm@...ux-foundation.org>,
	"linux list" <linux-kernel@...r.kernel.org>
Cc:	André Goddard Rosa <andre.goddard@...il.com>
Subject: [PATCH v5 02/12][resend] vsprintf: pre-calculate final string length for later use

Signed-off-by: André Goddard Rosa <andre.goddard@...il.com>
Acked-by: Frederic Weisbecker <fweisbec@...il.com>
---
 lib/vsprintf.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index fe56825..1e08b0d 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1443,13 +1443,14 @@ do {									\
 		case FORMAT_TYPE_STR: {
 			const char *save_str = va_arg(args, char *);
 			size_t len;
+
 			if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE
 					|| (unsigned long)save_str < PAGE_SIZE)
 				save_str = "(null)";
-			len = strlen(save_str);
-			if (str + len + 1 < end)
-				memcpy(str, save_str, len + 1);
-			str += len + 1;
+			len = strlen(save_str) + 1;
+			if (str + len < end)
+				memcpy(str, save_str, len);
+			str += len;
 			break;
 		}
 
-- 
1.6.5.2.180.gc5b3e.dirty

--
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/