From owner-svn-ports-head@freebsd.org Thu Jul 16 20:05:08 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7E3B9A4906; Thu, 16 Jul 2015 20:05:08 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83B961C6A; Thu, 16 Jul 2015 20:05:08 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6GK58HG059328; Thu, 16 Jul 2015 20:05:08 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6GK58o8059326; Thu, 16 Jul 2015 20:05:08 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507162005.t6GK58o8059326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 16 Jul 2015 20:05:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392316 - in head/multimedia/libav: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jul 2015 20:05:08 -0000 Author: feld Date: Thu Jul 16 20:05:07 2015 New Revision: 392316 URL: https://svnweb.freebsd.org/changeset/ports/392316 Log: Add patch to resolve divide-by-zero CVE Security: CVE-2015-5479 Security: a928960a-2bdc-11e5-86ff-14dae9d210b8 Added: head/multimedia/libav/files/patch-CVE-2015-5479 (contents, props changed) Modified: head/multimedia/libav/Makefile Modified: head/multimedia/libav/Makefile ============================================================================== --- head/multimedia/libav/Makefile Thu Jul 16 19:40:31 2015 (r392315) +++ head/multimedia/libav/Makefile Thu Jul 16 20:05:07 2015 (r392316) @@ -2,7 +2,7 @@ PORTNAME= libav PORTVERSION= 11.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ Added: head/multimedia/libav/files/patch-CVE-2015-5479 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libav/files/patch-CVE-2015-5479 Thu Jul 16 20:05:07 2015 (r392316) @@ -0,0 +1,51 @@ +From: Luca Barbato +Date: Fri, 26 Jun 2015 13:57:16 +0000 (+0200) +Subject: h263: Always check both dimensions +X-Git-Url: https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=0a49a62f998747cfa564d98d36a459fe70d3299b;hp=6f4cd33efb5a9ec75db1677d5f7846c60337129f + +h263: Always check both dimensions + +CC: libav-stable@libav.org +Found-By: ago@gentoo.org +--- + +diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c +index b1da22f..b9189b2 100644 +--- libavcodec/ituh263dec.c.orig ++++ libavcodec/ituh263dec.c +@@ -30,6 +30,7 @@ + #include + + #include "libavutil/attributes.h" ++#include "libavutil/imgutils.h" + #include "libavutil/internal.h" + #include "libavutil/mathematics.h" + #include "avcodec.h" +@@ -868,7 +869,7 @@ end: + /* most is hardcoded. should extend to handle all h263 streams */ + int ff_h263_decode_picture_header(MpegEncContext *s) + { +- int format, width, height, i; ++ int format, width, height, i, ret; + uint32_t startcode; + + align_get_bits(&s->gb); +@@ -919,8 +920,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s) + /* H.263v1 */ + width = ff_h263_format[format][0]; + height = ff_h263_format[format][1]; +- if (!width) +- return -1; + + s->pict_type = AV_PICTURE_TYPE_I + get_bits1(&s->gb); + +@@ -1073,6 +1072,9 @@ int ff_h263_decode_picture_header(MpegEncContext *s) + s->qscale = get_bits(&s->gb, 5); + } + ++ if ((ret = av_image_check_size(s->width, s->height, 0, s)) < 0) ++ return ret; ++ + s->mb_width = (s->width + 15) / 16; + s->mb_height = (s->height + 15) / 16; + s->mb_num = s->mb_width * s->mb_height;