Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Oct 2015 18:57:45 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r399288 - in branches/2015Q4/net/miniupnpc: . files
Message-ID:  <201510141857.t9EIvjqe062256@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Oct 14 18:57:44 2015
New Revision: 399288
URL: https://svnweb.freebsd.org/changeset/ports/399288

Log:
  net/miniupnpc: backport TALOS-2015-0035 (aka CVE-2015-6031) fix
  
  Direct commit as /head in r399209 updated miniupnpc to a snapshot instead.
  
  PR:		203705
  Approved by:	portmgr (bapt)
  Security:	06fefd2f-728f-11e5-a371-14dae9d210b8
  Differential Revision:	https://reviews.freebsd.org/D3895

Added:
  branches/2015Q4/net/miniupnpc/files/patch-CVE-2015-6031   (contents, props changed)
Modified:
  branches/2015Q4/net/miniupnpc/Makefile

Modified: branches/2015Q4/net/miniupnpc/Makefile
==============================================================================
--- branches/2015Q4/net/miniupnpc/Makefile	Wed Oct 14 18:38:51 2015	(r399287)
+++ branches/2015Q4/net/miniupnpc/Makefile	Wed Oct 14 18:57:44 2015	(r399288)
@@ -2,6 +2,7 @@
 
 PORTNAME=	miniupnpc
 PORTVERSION=	1.9
+PORTREVISION?=	1
 CATEGORIES?=	net
 MASTER_SITES=	http://miniupnp.free.fr/files/
 

Added: branches/2015Q4/net/miniupnpc/files/patch-CVE-2015-6031
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q4/net/miniupnpc/files/patch-CVE-2015-6031	Wed Oct 14 18:57:44 2015	(r399288)
@@ -0,0 +1,24 @@
+commit 79cca974a4c2ab1199786732a67ff6d898051b78
+Author: Thomas Bernard <miniupnp@free.fr>
+Date:   Tue Sep 15 15:32:33 2015 +0200
+
+    igd_desc_parse.c: fix buffer overflow
+---
+ miniupnpc/igd_desc_parse.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/miniupnpc/igd_desc_parse.c b/miniupnpc/igd_desc_parse.c
+index 892a090..d2999ad 100644
+--- igd_desc_parse.c.orig	2011-04-11 09:19:37 UTC
++++ igd_desc_parse.c
+@@ -15,7 +15,9 @@
+ void IGDstartelt(void * d, const char * name, int l)
+ {
+ 	struct IGDdatas * datas = (struct IGDdatas *)d;
+-	memcpy( datas->cureltname, name, l);
++	if(l >= MINIUPNPC_URL_MAXSIZE)
++		l = MINIUPNPC_URL_MAXSIZE-1;
++	memcpy(datas->cureltname, name, l);
+ 	datas->cureltname[l] = '\0';
+ 	datas->level++;
+ 	if( (l==7) && !memcmp(name, "service", l) ) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510141857.t9EIvjqe062256>