From owner-svn-src-all@freebsd.org  Tue Nov  3 17:27:26 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 484A3A252A9;
 Tue,  3 Nov 2015 17:27:26 +0000 (UTC)
 (envelope-from ache@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 08F31101A;
 Tue,  3 Nov 2015 17:27:25 +0000 (UTC)
 (envelope-from ache@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA3HRPEJ012863;
 Tue, 3 Nov 2015 17:27:25 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA3HRP76012862;
 Tue, 3 Nov 2015 17:27:25 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201511031727.tA3HRP76012862@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ache set sender to
 ache@FreeBSD.org using -f
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Tue, 3 Nov 2015 17:27:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290336 - head/usr.bin/bsdiff/bsdiff
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Nov 2015 17:27:26 -0000

Author: ache
Date: Tue Nov  3 17:27:24 2015
New Revision: 290336
URL: https://svnweb.freebsd.org/changeset/base/290336

Log:
  Check for (old|new)size + 1 overflows off_t.
  
  PR:     204230
  MFC after:      1 week

Modified:
  head/usr.bin/bsdiff/bsdiff/bsdiff.c

Modified: head/usr.bin/bsdiff/bsdiff/bsdiff.c
==============================================================================
--- head/usr.bin/bsdiff/bsdiff/bsdiff.c	Tue Nov  3 12:37:55 2015	(r290335)
+++ head/usr.bin/bsdiff/bsdiff/bsdiff.c	Tue Nov  3 17:27:24 2015	(r290336)
@@ -237,7 +237,8 @@ int main(int argc,char *argv[])
 		err(1, "%s", argv[1]);
 
 	if (oldsize > SSIZE_MAX ||
-	    (uintmax_t)oldsize >= SIZE_T_MAX / sizeof(off_t)) {
+	    (uintmax_t)oldsize >= SIZE_T_MAX / sizeof(off_t) ||
+	    oldsize == OFF_MAX) {
 		errno = EFBIG;
 		err(1, "%s", argv[1]);
 	}
@@ -260,7 +261,8 @@ int main(int argc,char *argv[])
 	    ((newsize=lseek(fd,0,SEEK_END))==-1))
 		err(1, "%s", argv[2]);
 
-	if (newsize > SSIZE_MAX || (uintmax_t)newsize >= SIZE_T_MAX) {
+	if (newsize > SSIZE_MAX || (uintmax_t)newsize >= SIZE_T_MAX ||
+	    newsize == OFF_MAX) {
 		errno = EFBIG;
 		err(1, "%s", argv[2]);
 	}