linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Maurizio Lombardi <mlombard@redhat.com>
To: tj@kernel.org
Cc: joe@perches.com, linux@rasmusvillemoes.dk, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 2/3] lib/vsprintf.c: append "..." if the *pb[l] output has been truncated.
Date: Wed, 16 Sep 2015 11:08:42 +0200	[thread overview]
Message-ID: <1442394523-19176-3-git-send-email-mlombard@redhat.com> (raw)
In-Reply-To: <1442394523-19176-1-git-send-email-mlombard@redhat.com>

The *pb[l] format may generate a very long string that could exaust
the output buffer capacity;
when such event happens the output could be misleading,
it may appear valid but part of it has been truncated.

This patch modifies the bitmap_*_string() functions so they will append
"..." to the output to inform the user that a truncation happened.

Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
---
 lib/vsprintf.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 8707d91..f49bf54 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -816,6 +816,7 @@ char *bitmap_string(char *buf, char *end, unsigned long *bitmap,
 	int i, chunksz;
 	bool first = true;
 	struct printf_spec spec = *specp;
+	const char *buf_start = buf;
 
 	/* reused to print numbers */
 	spec = (struct printf_spec){ .flags = SMALL | ZEROPAD, .base = 16 };
@@ -846,6 +847,29 @@ char *bitmap_string(char *buf, char *end, unsigned long *bitmap,
 
 		chunksz = CHUNKSZ;
 	}
+
+	if (buf >= end && buf_start != end) {
+		int spc = 0;
+		char *trunc = end - 1;
+
+		while (trunc > buf_start) {
+			if (*trunc == ',' && spc > 3) {
+				trunc++;
+				break;
+			}
+			trunc--;
+			spc++;
+		}
+
+		if (spc > 3) {
+			trunc[0] = '.';
+			trunc[1] = '.';
+			trunc[2] = '.';
+			trunc[3] = '\0';
+		} else
+			trunc[0] = '\0';
+	}
+
 	return buf;
 }
 
@@ -858,6 +882,7 @@ char *bitmap_list_string(char *buf, char *end, unsigned long *bitmap,
 	int cur, rbot, rtop;
 	bool first = true;
 	struct printf_spec spec = *specp;
+	const char *buf_start = buf;
 
 	/* reused to print numbers */
 	spec = (struct printf_spec){ .base = 10 };
@@ -887,6 +912,29 @@ char *bitmap_list_string(char *buf, char *end, unsigned long *bitmap,
 
 		rbot = cur;
 	}
+
+	if (buf >= end && buf_start != end) {
+		int spc = 0;
+		char *trunc = end - 1;
+
+		while (trunc > buf_start) {
+			if (*trunc == ',' && spc > 3) {
+				trunc++;
+				break;
+			}
+			trunc--;
+			spc++;
+		}
+
+		if (spc > 3) {
+			trunc[0] = '.';
+			trunc[1] = '.';
+			trunc[2] = '.';
+			trunc[3] = '\0';
+		} else
+			trunc[0] = '\0';
+	}
+
 	return buf;
 }
 
-- 
Maurizio Lombardi


  parent reply	other threads:[~2015-09-16  9:08 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-16  9:08 [RFC PATCH 0/3] fix *pbl format support Maurizio Lombardi
2015-09-16  9:08 ` [RFC PATCH 1/3] lib/vsprintf.c: Do not pass printf_spec by value on stack Maurizio Lombardi
2015-09-16  9:08 ` Maurizio Lombardi [this message]
2015-09-16  9:08 ` [RFC PATCH 3/3] lib/vsprintf.c: increase the size of the field_width variable Maurizio Lombardi
2015-09-16 12:27 ` [RFC PATCH 0/3] fix *pbl format support Rasmus Villemoes
2015-09-16 12:53   ` Maurizio Lombardi
2015-09-16 17:45   ` Tejun Heo
2015-09-16 20:35     ` Rasmus Villemoes
2015-09-21 14:54       ` Maurizio Lombardi
2015-09-21 16:24         ` 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=1442394523-19176-3-git-send-email-mlombard@redhat.com \
    --to=mlombard@redhat.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@rasmusvillemoes.dk \
    --cc=tj@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).