From owner-svn-src-stable@FreeBSD.ORG Tue Jan 20 22:34:39 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0799A106566C; Tue, 20 Jan 2009 22:34:39 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EA5158FC08; Tue, 20 Jan 2009 22:34:38 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0KMYcab058828; Tue, 20 Jan 2009 22:34:38 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0KMYclD058827; Tue, 20 Jan 2009 22:34:38 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <200901202234.n0KMYclD058827@svn.freebsd.org> From: Ed Maste Date: Tue, 20 Jan 2009 22:34:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187496 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jan 2009 22:34:39 -0000 Author: emaste Date: Tue Jan 20 22:34:38 2009 New Revision: 187496 URL: http://svn.freebsd.org/changeset/base/187496 Log: MFC r181693: Fix REDZONE(9) on amd64 and perhaps other 64 bit targets -- ensure the space that redzone adds to the allocation for storing its metadata is at least as large as the metadata that it will store there. PR: kern/128744 Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/vm/redzone.c Modified: stable/7/sys/vm/redzone.c ============================================================================== --- stable/7/sys/vm/redzone.c Tue Jan 20 22:26:09 2009 (r187495) +++ stable/7/sys/vm/redzone.c Tue Jan 20 22:34:38 2009 (r187496) @@ -54,6 +54,8 @@ static u_long redzone_roundup(u_long n) { + if (n < REDZONE_HSIZE) + n = REDZONE_HSIZE; if (n <= 128) return (128); else if (n <= 256)