From owner-svn-src-all@FreeBSD.ORG  Fri Feb 13 23:19:36 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 14A8BF45;
 Fri, 13 Feb 2015 23:19:36 +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 F37E4A3B;
 Fri, 13 Feb 2015 23:19:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1DNJZ1M057046;
 Fri, 13 Feb 2015 23:19:35 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1DNJZuP057045;
 Fri, 13 Feb 2015 23:19:35 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201502132319.t1DNJZuP057045@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: Fri, 13 Feb 2015 23:19:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278729 - head/sys/sys
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.18-1
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 23:19:36 -0000

Author: sjg
Date: Fri Feb 13 23:19:35 2015
New Revision: 278729
URL: https://svnweb.freebsd.org/changeset/base/278729

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

Modified:
  head/sys/sys/sockbuf.h

Modified: head/sys/sys/sockbuf.h
==============================================================================
--- head/sys/sys/sockbuf.h	Fri Feb 13 22:55:25 2015	(r278728)
+++ head/sys/sys/sockbuf.h	Fri Feb 13 23:19:35 2015	(r278729)
@@ -212,7 +212,7 @@ sbused(struct sockbuf *sb)
 static inline long
 sbspace(struct sockbuf *sb)
 {
-	long bleft, mleft;
+	int bleft, mleft;		/* size should match sockbuf fields */
 
 #if 0
 	SOCKBUF_LOCK_ASSERT(sb);