Add fir for the remote DoS vulnerability reported in CVE-2012-3548 taken from the Wireshark SVN repository.diff -r1.83 -r1.84 pkgsrc/net/wireshark/Makefile
(tron)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.83 2012/08/20 12:21:53 tron Exp $ | 1 | # $NetBSD: Makefile,v 1.84 2012/09/04 23:08:38 tron Exp $ | |
2 | 2 | |||
3 | DISTNAME= wireshark-1.8.2 | 3 | DISTNAME= wireshark-1.8.2 | |
4 | PKGREVISION= 1 | 4 | PKGREVISION= 2 | |
5 | CATEGORIES= net | 5 | CATEGORIES= net | |
6 | MASTER_SITES= http://www.wireshark.org/download/src/ \ | 6 | MASTER_SITES= http://www.wireshark.org/download/src/ \ | |
7 | ${MASTER_SITE_SOURCEFORGE:=wireshark/} | 7 | ${MASTER_SITE_SOURCEFORGE:=wireshark/} | |
8 | EXTRACT_SUFX= .tar.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
9 | 9 | |||
10 | OWNER= tron@NetBSD.org | 10 | OWNER= tron@NetBSD.org | |
11 | HOMEPAGE= http://www.wireshark.org/ | 11 | HOMEPAGE= http://www.wireshark.org/ | |
12 | COMMENT= Network protocol analyzer | 12 | COMMENT= Network protocol analyzer | |
13 | LICENSE= gnu-gpl-v2 | 13 | LICENSE= gnu-gpl-v2 | |
14 | 14 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 16 | |||
17 | CONFLICTS+= ethereal-[0-9]* | 17 | CONFLICTS+= ethereal-[0-9]* |
@@ -1,13 +1,14 @@ | @@ -1,13 +1,14 @@ | |||
1 | $NetBSD: distinfo,v 1.58 2012/08/20 08:34:44 christos Exp $ | 1 | $NetBSD: distinfo,v 1.59 2012/09/04 23:08:38 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (wireshark-1.8.2.tar.bz2) = 4737d9745dbf002444ea42615243abf3bb80b943 | 3 | SHA1 (wireshark-1.8.2.tar.bz2) = 4737d9745dbf002444ea42615243abf3bb80b943 | |
4 | RMD160 (wireshark-1.8.2.tar.bz2) = 5fece857d5187b146a690fda111a0611e108c2a9 | 4 | RMD160 (wireshark-1.8.2.tar.bz2) = 5fece857d5187b146a690fda111a0611e108c2a9 | |
5 | Size (wireshark-1.8.2.tar.bz2) = 24121798 bytes | 5 | Size (wireshark-1.8.2.tar.bz2) = 24121798 bytes | |
6 | SHA1 (patch-CVE-2012-3548) = 0d72d0e485ed09e1c28bd85bf1f06aa390be4981 | |||
6 | SHA1 (patch-aa) = 78b9c01d7ecc272f1188a3fb8cfb806c8a040f6d | 7 | SHA1 (patch-aa) = 78b9c01d7ecc272f1188a3fb8cfb806c8a040f6d | |
7 | SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c | 8 | SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c | |
8 | SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 | 9 | SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 | |
9 | SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df | 10 | SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df | |
10 | SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 | 11 | SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 | |
11 | SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352 | 12 | SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352 | |
12 | SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e | 13 | SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e | |
13 | SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077 | 14 | SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077 |
$NetBSD: patch-CVE-2012-3548,v 1.1 2012/09/04 23:08:38 tron Exp $
Fix for the remote DoS security vulnerability reported in CVE-2012-3548.
The patch was taken from the Wireshark SVN repository:
http://anonsvn.wireshark.org/viewvc?view=revision&revision=44749
--- epan/dissectors/packet-drda.c.orig 2012-06-05 17:33:38.000000000 +0100
+++ epan/dissectors/packet-drda.c 2012-09-04 21:38:12.000000000 +0100
@@ -55,6 +55,7 @@
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/prefs.h>
+#include <epan/expert.h>
#include "packet-tcp.h"
static int proto_drda = -1;
@@ -696,6 +697,10 @@
{
iCommand = tvb_get_ntohs(tvb, offset + 8);
iLength = tvb_get_ntohs(tvb, offset + 0);
+ if (iLength < 10) {
+ expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Invalid length detected (%u): should be at least 10 bytes long", iLength);
+ break;
+ }
/* iCommandEnd is the length of the packet up to the end of the current command */
iCommandEnd += iLength;