diff options
| author | snj <snj@pkgsrc.org> | 2005-06-13 05:31:49 +0000 |
|---|---|---|
| committer | snj <snj@pkgsrc.org> | 2005-06-13 05:31:49 +0000 |
| commit | 218ce539908fc1442f1090ce77dccf21628a1f20 (patch) | |
| tree | 57b998cb1d0440a1cddc16b2b4e42f7cc65650c5 | |
| parent | 2ab2228542d14f11b7b3c6506ed603c34a70d1c0 (diff) | |
| download | pkgsrc-218ce539908fc1442f1090ce77dccf21628a1f20.tar.gz | |
Pullup ticket 549 - requested by Lubomir Sedlacik
security fix for tcpdump
Revisions pulled up:
- pkgsrc/net/tcpdump/Makefile 1.16
- pkgsrc/net/tcpdump/distinfo 1.9
- pkgsrc/net/tcpdump/patches/patch-ac 1.2
Module Name: pkgsrc
Committed By: salo
Date: Sun Jun 12 15:38:32 UTC 2005
Modified Files:
pkgsrc/net/tcpdump: Makefile distinfo
pkgsrc/net/tcpdump/patches: patch-ac
Log Message:
Security fix for DoS in BGP packets' processing.
Patch from tcpdump cvs.
| -rw-r--r-- | net/tcpdump/Makefile | 4 | ||||
| -rw-r--r-- | net/tcpdump/distinfo | 4 | ||||
| -rw-r--r-- | net/tcpdump/patches/patch-ac | 21 |
3 files changed, 21 insertions, 8 deletions
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile index 219acdfcc1b..31cd425f28c 100644 --- a/net/tcpdump/Makefile +++ b/net/tcpdump/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13.2.1 2005/05/28 22:24:59 salo Exp $ +# $NetBSD: Makefile,v 1.13.2.2 2005/06/13 05:31:49 snj Exp $ DISTNAME= tcpdump-3.8.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.tcpdump.org/release/ diff --git a/net/tcpdump/distinfo b/net/tcpdump/distinfo index b9bf0db2701..ab5c0d9f4a3 100644 --- a/net/tcpdump/distinfo +++ b/net/tcpdump/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.6.2.2 2005/05/28 22:24:59 salo Exp $ +$NetBSD: distinfo,v 1.6.2.3 2005/06/13 05:31:49 snj Exp $ SHA1 (tcpdump-3.8.3.tar.gz) = 7ae3c29fe843fc23ae89acd8b1b1e513213f6042 RMD160 (tcpdump-3.8.3.tar.gz) = 585c1ad9a93a8329b1d60057dd334e7b1a88097c Size (tcpdump-3.8.3.tar.gz) = 567116 bytes SHA1 (patch-aa) = d70302c6fa68d0d170fa5c22ce0a348bdf0233be SHA1 (patch-ab) = 628f0ecf34a7c9a5c17000b234360f7846c07847 -SHA1 (patch-ac) = 7dd47ee3ebaeba29c78bed66242739f0ded4a7f1 +SHA1 (patch-ac) = 94a334a86cd42e247e1270e74cc049b908db751a SHA1 (patch-ad) = 2229b6cf3af0b30bc612e3dca796f01d8e8bae90 SHA1 (patch-ae) = 9c3b318668c3558a9cee3ce90fe7ac17fd748de5 SHA1 (patch-af) = c0c0ce4a3a3eda013fea164ed173181b271ad6b1 diff --git a/net/tcpdump/patches/patch-ac b/net/tcpdump/patches/patch-ac index 52295bf0b5e..18566631419 100644 --- a/net/tcpdump/patches/patch-ac +++ b/net/tcpdump/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.2.2 2005/05/28 22:24:59 salo Exp $ +$NetBSD: patch-ac,v 1.1.2.3 2005/06/13 05:31:49 snj Exp $ ---- print-bgp.c.orig 2005-05-06 09:08:17.000000000 +0100 -+++ print-bgp.c -@@ -1216,6 +1216,8 @@ bgp_attr_print(const struct bgp_attr *at +--- print-bgp.c.orig 2004-03-24 01:04:04.000000000 +0100 ++++ print-bgp.c 2005-06-12 17:22:17.000000000 +0200 +@@ -1216,6 +1216,8 @@ tptr = pptr + len; break; } @@ -11,3 +11,16 @@ $NetBSD: patch-ac,v 1.1.2.2 2005/05/28 22:24:59 salo Exp $ tptr += advance; } break; +@@ -1646,9 +1648,10 @@ + while (dat + length > p) { + char buf[MAXHOSTNAMELEN + 100]; + i = decode_prefix4(p, buf, sizeof(buf)); +- if (i == -1) ++ if (i == -1) { + printf("\n\t (illegal prefix length)"); +- else if (i == -2) ++ break; ++ } else if (i == -2) + goto trunc; + else { + printf("\n\t %s", buf); |