From: Thomas Jarosch <thomas.jarosch@intra2net.com>
To: Patrick McHardy <kaber@trash.net>
Cc: netfilter-devel@vger.kernel.org
Subject: [libnl-nft PATCH] Fix out of bounds buffer access in rtnl_netem_set_delay_distribution()
Date: Tue, 25 Dec 2012 15:15:27 +0100 [thread overview]
Message-ID: <50D9B4FF.9000806@intra2net.com> (raw)
sizeof(test_path) returns the array size
and not the number of array elements.
Detected by cppcheck
Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
---
lib/route/sch/netem.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/route/sch/netem.c b/lib/route/sch/netem.c
index 18878a7..5894fd9 100644
--- a/lib/route/sch/netem.c
+++ b/lib/route/sch/netem.c
@@ -861,7 +861,7 @@ int rtnl_netem_set_delay_distribution(struct rtnl_qdisc *qdisc, const char *dist
return -NLE_NOMEM;
FILE *f = NULL;
- int i, n = 0;
+ int i = 0, n = 0;
size_t len = 2048;
char *line;
char name[NAME_MAX];
@@ -873,11 +873,12 @@ int rtnl_netem_set_delay_distribution(struct rtnl_qdisc *qdisc, const char *dist
strcpy(dist_suffix, "");
/* Check several locations for the dist file */
- char *test_path[] = { "", "./", "/usr/lib/tc/", "/usr/local/lib/tc/" };
+ char *test_path[] = { "", "./", "/usr/lib/tc/", "/usr/local/lib/tc/", NULL };
- for (i = 0; i < sizeof(test_path) && f == NULL; i++) {
+ while(f == NULL && test_path[i] != NULL) {
snprintf(name, NAME_MAX, "%s%s%s", test_path[i], dist_type, dist_suffix);
f = fopen(name, "r");
+ ++i;
}
if ( f == NULL )
--
1.7.11.7
next reply other threads:[~2012-12-25 14:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-25 14:15 Thomas Jarosch [this message]
2012-12-26 22:11 ` [libnl-nft PATCH] Fix out of bounds buffer access in rtnl_netem_set_delay_distribution() Pablo Neira Ayuso
2012-12-27 6:23 ` Patrick McHardy
2012-12-27 9:48 ` Thomas Jarosch
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=50D9B4FF.9000806@intra2net.com \
--to=thomas.jarosch@intra2net.com \
--cc=kaber@trash.net \
--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).