From owner-svn-src-stable@freebsd.org  Mon Jul 25 14:53:05 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 90B7BBA3615;
 Mon, 25 Jul 2016 14:53:05 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 5FE331CE4;
 Mon, 25 Jul 2016 14:53:05 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6PEr40R054240;
 Mon, 25 Jul 2016 14:53:04 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6PEr4gv054239;
 Mon, 25 Jul 2016 14:53:04 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201607251453.u6PEr4gv054239@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 25 Jul 2016 14:53:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r303301 - in stable: 10/usr.bin/bsdiff/bspatch
 9/usr.bin/bsdiff/bspatch
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jul 2016 14:53:05 -0000

Author: delphij
Date: Mon Jul 25 14:53:04 2016
New Revision: 303301
URL: https://svnweb.freebsd.org/changeset/base/303301

Log:
  Fix bspatch heap overflow vulnerability.
  
  Obtained from:	Chromium
  Reported by:	Lu Tung-Pin
  Security:	FreeBSD-SA-16:25.bspatch

Modified:
  stable/9/usr.bin/bsdiff/bspatch/bspatch.c

Changes in other areas also in this revision:
Modified:
  stable/10/usr.bin/bsdiff/bspatch/bspatch.c

Modified: stable/9/usr.bin/bsdiff/bspatch/bspatch.c
==============================================================================
--- stable/9/usr.bin/bsdiff/bspatch/bspatch.c	Mon Jul 25 14:52:12 2016	(r303300)
+++ stable/9/usr.bin/bsdiff/bspatch/bspatch.c	Mon Jul 25 14:53:04 2016	(r303301)
@@ -155,6 +155,10 @@ int main(int argc,char * argv[])
 		};
 
 		/* Sanity-check */
+		if ((ctrl[0] < 0) || (ctrl[1] < 0))
+			errx(1,"Corrupt patch\n");
+
+		/* Sanity-check */
 		if(newpos+ctrl[0]>newsize)
 			errx(1,"Corrupt patch\n");