Revision: 1892
http://undernet-ircu.svn.sourceforge.net/undernet-ircu/?rev=1892&view=rev
Author: entrope
Date: 2008-11-18 03:16:05 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
Update the match() unit test to catch buffer over-reads.
Modified Paths:
--------------
ircu2/branches/u2_10_12_branch/ChangeLog
ircu2/branches/u2_10_12_branch/ircd/test/ircd_match_t.c
Modified: ircu2/branches/u2_10_12_branch/ChangeLog
===================================================================
--- ircu2/branches/u2_10_12_branch/ChangeLog 2008-11-18 02:30:15 UTC (rev
1891)
+++ ircu2/branches/u2_10_12_branch/ChangeLog 2008-11-18 03:16:05 UTC (rev
1892)
@@ -3,6 +3,11 @@
* ircd/match.c (match): Fix an error in backtracking (apparently
exacerbated by escapes).
+ * ircd/test/ircd_match_t.c: Update headers and make sure we have a
+ mmap() anonymous request flag.
+ (test_match): New function.
+ (do_match_test): Use it instead of calling match() directly.
+
2008-09-07 Perry Lorier <[EMAIL PROTECTED]>
* ircd/m_kill.c: Remove the . from the end of the nickname in kill
Modified: ircu2/branches/u2_10_12_branch/ircd/test/ircd_match_t.c
===================================================================
--- ircu2/branches/u2_10_12_branch/ircd/test/ircd_match_t.c 2008-11-18
02:30:15 UTC (rev 1891)
+++ ircu2/branches/u2_10_12_branch/ircd/test/ircd_match_t.c 2008-11-18
03:16:05 UTC (rev 1892)
@@ -4,9 +4,22 @@
#include "ircd_log.h"
#include "match.h"
+
+#include <errno.h> /* errno */
+#include <fcntl.h> /* O_RDONLY */
#include <stdio.h>
#include <string.h>
+#include <sys/mman.h> /* mmap(), munmap() */
+#include <unistd.h> /* sysconf() */
+#if !defined(MAP_ANONYMOUS)
+# if defined(MAP_ANON)
+# define MAP_ANONYMOUS MAP_ANON
+# else
+# error I do not know how to request an anonymous mmap from your OS.
+# endif
+#endif
+
struct match_test {
const char *glob;
const char *should_match;
@@ -32,9 +45,75 @@
{ "\\?",
"?\0",
"a\0" },
+ { "*\\\\[*!~*",
+ "har\\[dy!~boy\0",
+ "dark\\s|de!pimp\0joe\\[mama\0" },
{ NULL, NULL, NULL }
};
+int test_match(const char glob[], const char name[])
+{
+ static unsigned int page_size;
+ static char *pages;
+ char *test_glob;
+ char *test_name;
+ size_t length;
+ int res;
+
+ /* If we have not yet set up our test mappings, do so. */
+ if (!page_size)
+ {
+ int dev_zero_fd;
+
+ page_size = sysconf(_SC_PAGE_SIZE);
+ if (page_size == 0 || page_size == (unsigned int)-1)
+ {
+ fprintf(stderr, "sysconf(_SC_PAGE_SIZE) failed: %s\n", strerror(errno));
+ assert(0);
+ }
+ dev_zero_fd = open("/dev/zero", O_RDONLY);
+ /* If dev_zero_fd == -1 (failed), we may still be able to mmap
anonymously. */
+ pages = mmap(NULL, 4 * page_size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
MAP_ANONYMOUS, dev_zero_fd, 0);
+ if (pages == MAP_FAILED)
+ {
+ /* Try using fd == -1 for MAP_ANONYMOUS, which BSD systems require. */
+ pages = mmap(NULL, 4 * page_size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
MAP_ANONYMOUS, -1, 0);
+ }
+ if (pages == MAP_FAILED)
+ {
+ fprintf(stderr, "Unable to map pages: %s\n", strerror(errno));
+ assert(0);
+ }
+ if (dev_zero_fd >= 0)
+ {
+ close(dev_zero_fd);
+ dev_zero_fd = -1;
+ }
+ res = munmap(pages + page_size * 1, page_size);
+ if (res < 0)
+ {
+ fprintf(stderr, "Unable to unmap page 2/4: %s\n", strerror(errno));
+ /* Dysfunctional OSes */
+ }
+ munmap(pages + page_size * 3, page_size);
+ if (res < 0)
+ {
+ fprintf(stderr, "Unable to unmap page 4/4: %s\n", strerror(errno));
+ }
+ }
+
+ /* Copy the strings to the end of their respective pages. */
+ length = strlen(glob) + 1;
+ test_glob = pages + page_size * 1 - length;
+ memcpy(test_glob, glob, length);
+ length = strlen(name) + 1;
+ test_name = pages + page_size * 3 - length;
+ memcpy(test_name, name, length);
+
+ /* Perform the test. */
+ return match(test_glob, test_name);
+}
+
void do_match_test(const struct match_test *test)
{
const char *candidate;
@@ -44,7 +123,7 @@
for (candidate = test->should_match, matched = 0;
*candidate;
candidate += strlen(candidate) + 1, ++matched) {
- res = match(test->glob, candidate);
+ res = test_match(test->glob, candidate);
if (res != 0) {
fprintf(stderr, "\"%s\" failed to match \"%s\".\n", test->glob,
candidate);
assert(0);
@@ -54,7 +133,7 @@
for (candidate = test->shouldnt_match, not_matched = 0;
*candidate;
candidate += strlen(candidate) + 1, ++not_matched) {
- res = match(test->glob, candidate);
+ res = test_match(test->glob, candidate);
if (res == 0) {
fprintf(stderr, "\"%s\" incorrectly matched \"%s\".\n", test->glob,
candidate);
assert(0);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
