From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org
Subject: [libnftnl PATCH] internal: fix SNPRINTF_BUFFER_SIZE macro
Date: Fri, 09 May 2014 13:58:06 +0200 [thread overview]
Message-ID: <20140509115806.2467.11788.stgit@nfdev.cica.es> (raw)
We need to store in 'offset' the complete amount of characters as returned
from _snprintf. The value means how many characters long needs the buffer to be
in order to store the corresponding string expansion.
Before this patch, in cases where the buffer is smaller than the
expansion, then ret > len, and therefore ret = len.
So when incrementing offset, we do it with a wrong value.
All previous versions of libnftnl are unable to handle this situations: small
buffers (or long string expansion).
BTW, if a caller must reallocate a buffer to the returned value of snprintf, it
should be ret + 1.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
src/internal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/internal.h b/src/internal.h
index 6595e70..43d61ca 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -184,9 +184,9 @@ struct nft_set_elem {
#define SNPRINTF_BUFFER_SIZE(ret, size, len, offset) \
size += ret; \
+ offset += ret; \
if (ret > len) \
ret = len; \
- offset += ret; \
len -= ret;
#define div_round_up(n, d) (((n) + (d) - 1) / (d))
next reply other threads:[~2014-05-09 11:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 11:58 Arturo Borrero Gonzalez [this message]
2014-05-09 16:32 ` [libnftnl PATCH] internal: fix SNPRINTF_BUFFER_SIZE macro Arturo Borrero Gonzalez
2014-05-12 15:37 ` Pablo Neira Ayuso
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=20140509115806.2467.11788.stgit@nfdev.cica.es \
--to=arturo.borrero.glez@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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).