From: Eric Leblond <eric@regit.org>
To: netfilter-devel@vger.kernel.org
Cc: eric@regit.org
Subject: [nftables 1/3] erec: fix buffer overflow
Date: Wed, 24 Jun 2015 09:51:49 +0200 [thread overview]
Message-ID: <1435132311-31452-2-git-send-email-eric@regit.org> (raw)
In-Reply-To: <1435132311-31452-1-git-send-email-eric@regit.org>
A static array was used to read data and to write information in
it without checking the limit of the array. The result was a buffer
overflow when the line was longer than 1024.
This patch now uses a allocated buffer to avoid the problem.
Signed-off-by: Eric Leblond <eric@regit.org>
---
src/erec.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/erec.c b/src/erec.c
index 810e9bf..75a3f74 100644
--- a/src/erec.c
+++ b/src/erec.c
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
+#include <stdlib.h>
#include <netlink.h>
#include <gmputil.h>
@@ -82,6 +83,7 @@ void erec_print(FILE *f, const struct error_record *erec)
const struct input_descriptor *indesc = loc->indesc, *tmp;
const char *line = NULL; /* silence gcc */
char buf[1024];
+ char *pbuf = NULL;
unsigned int i, end;
int l, ret;
@@ -141,17 +143,24 @@ void erec_print(FILE *f, const struct error_record *erec)
if (indesc->type != INDESC_INTERNAL)
fprintf(f, "%s\n", line);
- memset(buf, ' ', sizeof(buf));
end = 0;
for (l = erec->num_locations - 1; l >= 0; l--) {
loc = &erec->locations[l];
+ end = max(end, loc->last_column);
+ }
+ pbuf = malloc(end + 1);
+ if (pbuf == NULL)
+ return;
+ memset(pbuf, ' ', end + 1);
+ for (l = erec->num_locations - 1; l >= 0; l--) {
+ loc = &erec->locations[l];
for (i = loc->first_column ? loc->first_column - 1 : 0;
i < loc->last_column; i++)
- buf[i] = l ? '~' : '^';
- end = max(end, loc->last_column);
+ pbuf[i] = l ? '~' : '^';
}
- buf[end] = '\0';
- fprintf(f, "%s", buf);
+ pbuf[end] = '\0';
+ fprintf(f, "%s", pbuf);
+ free(pbuf);
}
fprintf(f, "\n");
}
--
2.1.4
next prev parent reply other threads:[~2015-06-24 7:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-24 7:51 [nftables 0/3] misc fixes Eric Leblond
2015-06-24 7:51 ` Eric Leblond [this message]
2015-06-30 0:03 ` [nftables 1/3] erec: fix buffer overflow Pablo Neira Ayuso
2015-06-24 7:51 ` [nftables 2/3] erec: fix logic when reading from file Eric Leblond
2015-06-30 0:03 ` Pablo Neira Ayuso
2015-06-24 7:51 ` [nftables 3/3] mnl: improve select timeout logic Eric Leblond
2015-06-24 9:31 ` Eric Leblond
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=1435132311-31452-2-git-send-email-eric@regit.org \
--to=eric@regit.org \
--cc=netfilter-devel@vger.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).