From owner-svn-ports-head@FreeBSD.ORG  Wed Sep  5 15:59:56 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C8C01106571A;
	Wed,  5 Sep 2012 15:59:55 +0000 (UTC)
	(envelope-from marcus@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A18588FC20;
	Wed,  5 Sep 2012 15:59:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q85FxtS6064892;
	Wed, 5 Sep 2012 15:59:55 GMT (envelope-from marcus@svn.freebsd.org)
Received: (from marcus@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q85FxtQw064889;
	Wed, 5 Sep 2012 15:59:55 GMT (envelope-from marcus@svn.freebsd.org)
Message-Id: <201209051559.q85FxtQw064889@svn.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Wed, 5 Sep 2012 15:59:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303711 - in head/net/wireshark: . files
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Sep 2012 15:59:56 -0000

Author: marcus
Date: Wed Sep  5 15:59:55 2012
New Revision: 303711
URL: http://svn.freebsd.org/changeset/ports/303711

Log:
  Add a fix for CVE-2012-3548.
  
  PR:		171220
  Submitted by:	rea
  Obtained from:	Wireshark bug 9009

Added:
  head/net/wireshark/files/patch-cve-2012-3548   (contents, props changed)
Modified:
  head/net/wireshark/Makefile

Modified: head/net/wireshark/Makefile
==============================================================================
--- head/net/wireshark/Makefile	Wed Sep  5 15:43:33 2012	(r303710)
+++ head/net/wireshark/Makefile	Wed Sep  5 15:59:55 2012	(r303711)
@@ -7,6 +7,7 @@
 
 PORTNAME?=	wireshark
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
 		http://ftp.uni-kl.de/pub/wireshark/src/ \

Added: head/net/wireshark/files/patch-cve-2012-3548
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/wireshark/files/patch-cve-2012-3548	Wed Sep  5 15:59:55 2012	(r303711)
@@ -0,0 +1,23 @@
+Obtained-from: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=9009&action=diff&context=patch&collapsed=&headers=1&format=raw
+
+--- epan/dissectors/packet-drda.c	(revision 44689)
++++ epan/dissectors/packet-drda.c	(working copy)
+@@ -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;
+