From owner-svn-src-all@freebsd.org  Wed May  4 00:29:06 2016
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 6C132B2BA7E;
 Wed,  4 May 2016 00:29:06 +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 3C1DA1BE3;
 Wed,  4 May 2016 00:29:06 +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 u440T5eU047678;
 Wed, 4 May 2016 00:29:05 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u440T5or047677;
 Wed, 4 May 2016 00:29:05 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605040029.u440T5or047677@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 4 May 2016 00:29:05 +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: r299020 - 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.22
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: Wed, 04 May 2016 00:29:06 -0000

Author: ngie
Date: Wed May  4 00:29:05 2016
New Revision: 299020
URL: https://svnweb.freebsd.org/changeset/base/299020

Log:
  MFC r298368,r298660:
  
  r298368:
  
  Fix coverity issue with contrib/netbsd-tests/lib/libc/ssp/h_read.c
  
  Ensure opening /dev/zero succeeds. Abort the test if it doesn't.
  
  Also, use _PATH_DEVZERO instead of hardcoding "/dev/zero"
  
  CID: 1251410
  
  r298660:
  
  Fix up r298368
  
  Remove the semicolon accidentally added after the new conditional that tests
  that /dev/zero is opened successfully.
  
  CID: 1354980

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

Modified: stable/10/contrib/netbsd-tests/lib/libc/ssp/h_read.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/ssp/h_read.c	Wed May  4 00:26:47 2016	(r299019)
+++ stable/10/contrib/netbsd-tests/lib/libc/ssp/h_read.c	Wed May  4 00:29:05 2016	(r299020)
@@ -38,6 +38,7 @@ __RCSID("$NetBSD: h_read.c,v 1.1 2010/12
 
 #ifdef __FreeBSD__
 #include <fcntl.h>
+#include <paths.h>
 
 int
 main(int argc, char *argv[])
@@ -46,7 +47,8 @@ main(int argc, char *argv[])
 	int fd, n;
 	size_t len = atoi(argv[1]);
 
-	fd = open("/dev/zero", O_RDONLY);
+	if ((fd = open(_PATH_DEVZERO, O_RDONLY)) == -1)
+		abort();
 	if ((n = read(fd, b, len)) == -1)
 		abort();
 	(void)printf("%s\n", b);