From owner-svn-src-all@freebsd.org  Fri Jun  2 00:27:10 2017
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 077C0B95BE7;
 Fri,  2 Jun 2017 00:27:10 +0000 (UTC)
 (envelope-from ngie@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 CBDB4743DD;
 Fri,  2 Jun 2017 00:27:09 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v520R9Aq024101;
 Fri, 2 Jun 2017 00:27:09 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v520R9lB024100;
 Fri, 2 Jun 2017 00:27:09 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201706020027.v520R9lB024100@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Fri, 2 Jun 2017 00:27:09 +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: r319483 - stable/10/contrib/netbsd-tests/lib/libc/ssp
X-SVN-Group: stable-10
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.23
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: Fri, 02 Jun 2017 00:27:10 -0000

Author: ngie
Date: Fri Jun  2 00:27:08 2017
New Revision: 319483
URL: https://svnweb.freebsd.org/changeset/base/319483

Log:
  MFC r318210:
  
  ssp_test:read:: query the value of MAXPATHLEN via getconf(1)
  
  In the event the value of PATH_MAX was changed, the assumption that
  MAXPATHLEN is 1024 (and hence the buffer length required to trigger
  SSP to fail for read(2)) would be invalidated. Query getconf(1) for
  the actual value of MAXPATHLEN via _XOPEN_PATH_MAX instead, and
  increment the value by 1 to ensure that the SSP support tests the
  stack smashing support properly.

Modified:
  stable/10/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh	Fri Jun  2 00:00:02 2017	(r319482)
+++ stable/10/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh	Fri Jun  2 00:27:08 2017	(r319483)
@@ -392,7 +392,8 @@ read_body()
 		h_fail "$prog 1027" "echo bar |"
 	else
 	# End FreeBSD
-	h_fail "$prog 1025" "echo bar |"
+	MAX_PATH=$(getconf _XOPEN_MAX_PATH) || atf_fail "getconf failed"
+	h_fail "$prog $(( $MAX_PATH + 1))" "echo bar |"
 	# Begin FreeBSD
 	fi
 	# End FreeBSD