From: Alejandro Colomar <alx@kernel.org>
Date: Tue, 12 Nov 2024 14:19:19 +0000 (+0100)
Subject: lib/csrand.c: csrand(): Use read(2) instead of fread(2)
X-Git-Tag: 4.17.0-rc1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d6456542cca0025d37bc46bf12f482c53dde9a7;p=thirdparty%2Fshadow.git

lib/csrand.c: csrand(): Use read(2) instead of fread(2)

We don't need the heavy stdio for getting a few bytes from
</dev/urandom>.  Let's use the simpler POSIX API.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/csrand.c b/lib/csrand.c
index 8ded343a5..1914a3036 100644
--- a/lib/csrand.c
+++ b/lib/csrand.c
@@ -1,21 +1,19 @@
-/*
- * SPDX-FileCopyrightText:  Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
 
 #include <config.h>
 
 #ident "$Id$"
 
+#include <fcntl.h>
 #include <limits.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #if HAVE_SYS_RANDOM_H
 #include <sys/random.h>
 #endif
+
 #include "bit.h"
 #include "defines.h"
 #include "prototypes.h"
@@ -34,7 +32,7 @@ static unsigned long csrand_uniform_slow(unsigned long n);
 unsigned long
 csrand(void)
 {
-	FILE           *fp;
+	int            fd;
 	unsigned long  r;
 
 #ifdef HAVE_GETENTROPY
@@ -56,17 +54,16 @@ csrand(void)
 #endif
 
 	/* Use /dev/urandom as a last resort.  */
-	fp = fopen("/dev/urandom", "r");
-	if (NULL == fp) {
+	fd = open("/dev/urandom", O_RDONLY);
+	if (fd == -1)
 		goto fail;
-	}
 
-	if (fread(&r, sizeof(r), 1, fp) != 1) {
-		fclose(fp);
+	if (read(fd, &r, sizeof(r)) != sizeof(r)) {
+		close(fd);
 		goto fail;
 	}
 
-	fclose(fp);
+	close(fd);
 	return r;
 
 fail: