diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-04-16 11:21:44 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-04-16 11:21:44 +0000 |
| commit | e136016bf8a704cc363f39fcb8d07894c21b6d69 (patch) | |
| tree | 845bd7e46cdce976ad128ce647c0dfccf52988d2 /net/tcpdump | |
| parent | 534847e4fbd5b4b141dcdf8f936f5e91d56ca6ec (diff) | |
| download | ports-e136016bf8a704cc363f39fcb8d07894c21b6d69.tar.gz ports-e136016bf8a704cc363f39fcb8d07894c21b6d69.zip | |
- Add a patch to fix heap overflow
- Bump PORTREVISION
Obtained from: https://github.com/the-tcpdump-group/tcpdump/issues/446
MFH: 2015Q2
Security: CVE-2015-3138
Notes
Notes:
svn path=/head/; revision=384101
Diffstat (limited to 'net/tcpdump')
| -rw-r--r-- | net/tcpdump/Makefile | 1 | ||||
| -rw-r--r-- | net/tcpdump/files/patch-print-wb.c | 41 |
2 files changed, 42 insertions, 0 deletions
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile index aacf03cce710..811c1c20f9ad 100644 --- a/net/tcpdump/Makefile +++ b/net/tcpdump/Makefile @@ -3,6 +3,7 @@ PORTNAME= tcpdump PORTVERSION= 4.7.3 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.tcpdump.org/release/ diff --git a/net/tcpdump/files/patch-print-wb.c b/net/tcpdump/files/patch-print-wb.c new file mode 100644 index 000000000000..66a6ee089106 --- /dev/null +++ b/net/tcpdump/files/patch-print-wb.c @@ -0,0 +1,41 @@ +From 8aa5edea1b8846740514dee4158b6c707d38fc13 Mon Sep 17 00:00:00 2001 +From: Denis Ovsienko <denis@ovsienko.info> +Date: Wed, 25 Mar 2015 22:35:12 +0000 +Subject: [PATCH] whiteboard: fixup a few reversed tests (GH #446) + +This is a follow-up to commit 3a3ec26. +--- + print-wb.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/print-wb.c b/print-wb.c +index 38c2a67..e10d532 100644 +--- a/print-wb.c ++++ print-wb.c +@@ -202,7 +202,7 @@ wb_id(netdissect_options *ndo, + len -= sizeof(*io) * nid; + io = (struct id_off *)(id + 1); + cp = (char *)(io + nid); +- if (!ND_TTEST2(cp, len)) { ++ if (ND_TTEST2(cp, len)) { + ND_PRINT((ndo, "\"")); + fn_print(ndo, (u_char *)cp, (u_char *)cp + len); + ND_PRINT((ndo, "\"")); +@@ -267,7 +267,7 @@ wb_prep(netdissect_options *ndo, + } + n = EXTRACT_32BITS(&prep->pp_n); + ps = (const struct pgstate *)(prep + 1); +- while (--n >= 0 && !ND_TTEST(*ps)) { ++ while (--n >= 0 && ND_TTEST(*ps)) { + const struct id_off *io, *ie; + char c = '<'; + +@@ -276,7 +276,7 @@ wb_prep(netdissect_options *ndo, + ipaddr_string(ndo, &ps->page.p_sid), + EXTRACT_32BITS(&ps->page.p_uid))); + io = (struct id_off *)(ps + 1); +- for (ie = io + ps->nid; io < ie && !ND_TTEST(*io); ++io) { ++ for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) { + ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id), + EXTRACT_32BITS(&io->off))); + c = ','; |