From 35da36c439a3b623f33426fafe8a149b155ac1fc Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Tue, 24 Nov 2015 14:07:18 +0000
Subject: [PATCH] CID 1340063: fix TOCTOU

---
 sbin/cgdconfig/params.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sbin/cgdconfig/params.c b/sbin/cgdconfig/params.c
index 23d5833e2768..4129e3df5937 100644
--- a/sbin/cgdconfig/params.c
+++ b/sbin/cgdconfig/params.c
@@ -1,4 +1,4 @@
-/* $NetBSD: params.c,v 1.27 2015/11/22 20:24:19 christos Exp $ */
+/* $NetBSD: params.c,v 1.28 2015/11/24 14:07:18 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: params.c,v 1.27 2015/11/22 20:24:19 christos Exp $");
+__RCSID("$NetBSD: params.c,v 1.28 2015/11/24 14:07:18 christos Exp $");
 #endif
 
 #include <sys/types.h>
@@ -622,15 +622,15 @@ params_cget(const char *fn)
 	struct params	*p;
 	FILE		*f;
 	char		filename[MAXPATHLEN];
-	struct stat	st;
 
-	if (fn[0] != '/' && stat(fn, &st) == -1 && errno == ENOENT) {
+	if ((f = fopen(fn, "r")) == NULL && fn[0] != '/') {
 		snprintf(filename, sizeof(filename), "%s/%s",
 		    CGDCONFIG_DIR, fn);
 		fn = filename;
+		f = fopen(fn, "r");
 	}
 
-	if ((f = fopen(fn, "r")) == NULL) {
+	if (f == NULL) {
 		warn("failed to open params file \"%s\"", fn);
 		return NULL;
 	}