public inbox for b.a.t.m.a.n@lists.open-mesh.org
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH] batctl: Remove bogus length check in debugfs_make_path
Date: Mon, 14 Dec 2015 15:00:47 +0100	[thread overview]
Message-ID: <1450101647-9762-1-git-send-email-sven@narfation.org> (raw)

The length check never used the mesh_iface length in the size calculation.
Instead it used the length of the mountpoint and the format string. But the
length of the format string is not the length of the final string.

Instead remove this check and depend completely on the return value of
snprintf.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 debugfs.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/debugfs.c b/debugfs.c
index 04e47e9..3c58195 100644
--- a/debugfs.c
+++ b/debugfs.c
@@ -42,19 +42,12 @@ static const char *debugfs_known_mountpoints[] = {
 /* construct a full path to a debugfs element */
 int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size)
 {
-	int len;
-
 	if (strlen(debugfs_mountpoint) == 0) {
 		buffer[0] = '\0';
 		return -1;
 	}
 
-	len = strlen(debugfs_mountpoint) + strlen(fmt) + 1;
-	if (len >= size)
-		return len+1;
-
-	snprintf(buffer, size-1, fmt, debugfs_mountpoint, mesh_iface);
-	return 0;
+	return snprintf(buffer, size, fmt, debugfs_mountpoint, mesh_iface);
 }
 
 static int debugfs_found;
-- 
2.6.4


             reply	other threads:[~2015-12-14 14:00 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-14 14:00 Sven Eckelmann [this message]
2015-12-30 11:44 ` [B.A.T.M.A.N.] [PATCH] batctl: Remove bogus length check in debugfs_make_path Marek Lindner

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=1450101647-9762-1-git-send-email-sven@narfation.org \
    --to=sven@narfation.org \
    --cc=b.a.t.m.a.n@lists.open-mesh.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