From owner-svn-src-stable@FreeBSD.ORG  Thu Mar 12 17:07:46 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 42A2AD6A;
 Thu, 12 Mar 2015 17:07:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 2DB28A07;
 Thu, 12 Mar 2015 17:07:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2CH7kWA005371;
 Thu, 12 Mar 2015 17:07:46 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2CH7kQQ005370;
 Thu, 12 Mar 2015 17:07:46 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201503121707.t2CH7kQQ005370@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 12 Mar 2015 17:07:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r279930 - stable/10/sys/sys
X-SVN-Group: stable-10
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.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Mar 2015 17:07:46 -0000

Author: sjg
Date: Thu Mar 12 17:07:45 2015
New Revision: 279930
URL: https://svnweb.freebsd.org/changeset/base/279930

Log:
  MFC r278729
  
  sbspace: size of bleft, mleft must match sockbuf fields to avoid
  overflow on amd64
  
  Submitted by:   anshukla@juniper.net
  Obtained from:  Juniper Networks

Modified:
  stable/10/sys/sys/sockbuf.h

Modified: stable/10/sys/sys/sockbuf.h
==============================================================================
--- stable/10/sys/sys/sockbuf.h	Thu Mar 12 17:07:24 2015	(r279929)
+++ stable/10/sys/sys/sockbuf.h	Thu Mar 12 17:07:45 2015	(r279930)
@@ -175,8 +175,7 @@ static __inline
 long
 sbspace(struct sockbuf *sb)
 {
-	long bleft;
-	long mleft;
+	int bleft, mleft;		/* size should match sockbuf fields */
 
 	if (sb->sb_flags & SB_STOP)
 		return(0);