[PATCH 1/1] lib/randutils: drop unnecessary fcntl() in random_get_fd()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



We already pass O_CLOEXEC flag to open(), no need to modify
the file descriptor with FD_CLOEXEC afterwards.

This was a left over from commit b1fa3e2234fa ('lib: use O_CLOEXEC in
libcommon').

Signed-off-by: Thomas Haller <thaller@xxxxxxxxxx>
---
 lib/randutils.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/randutils.c b/lib/randutils.c
index 2ffe9b4f069e..15c2f7834969 100644
--- a/lib/randutils.c
+++ b/lib/randutils.c
@@ -80,16 +80,11 @@ static void crank_random(void)
 
 int random_get_fd(void)
 {
-	int i, fd;
+	int fd;
 
 	fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC);
 	if (fd == -1)
 		fd = open("/dev/random", O_RDONLY | O_NONBLOCK | O_CLOEXEC);
-	if (fd >= 0) {
-		i = fcntl(fd, F_GETFD);
-		if (i >= 0)
-			fcntl(fd, F_SETFD, i | FD_CLOEXEC);
-	}
 	crank_random();
 	return fd;
 }
-- 
2.39.2




[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux