From 597e4f476568a225d14dfaff02074cf269ad62ac Mon Sep 17 00:00:00 2001 From: Ryan Long Date: Tue, 2 Mar 2021 11:08:28 -0500 Subject: gen_uuid.c: Fix two Unchecked return value from library errors CID 1049146: Unchecked return value from library in get_clock(). CID 1049147: Unchecked return value from library in get_random_fd(). Closes #4280 --- cpukit/libmisc/uuid/gen_uuid.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cpukit/libmisc/uuid/gen_uuid.c b/cpukit/libmisc/uuid/gen_uuid.c index 3ca75a08ce..5bb34c0b09 100644 --- a/cpukit/libmisc/uuid/gen_uuid.c +++ b/cpukit/libmisc/uuid/gen_uuid.c @@ -155,6 +155,7 @@ static int get_random_fd(void) struct timeval tv; static int fd = -2; int i; + int sc; if (fd == -2) { gettimeofday(&tv, 0); @@ -164,8 +165,10 @@ static int get_random_fd(void) fd = open("/dev/random", O_RDONLY | O_NONBLOCK); if (fd >= 0) { i = fcntl(fd, F_GETFD); - if (i >= 0) - fcntl(fd, F_SETFD, i | FD_CLOEXEC); + if (i >= 0) { + sc = fcntl(fd, F_SETFD, i | FD_CLOEXEC); + _Assert_Unused_variable_unequal(sc, -1); + } } #endif srand((getpid() << ((sizeof(pid_t)*CHAR_BIT)>>1)) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec); @@ -334,6 +337,7 @@ static int get_clock(uint32_t *clock_high, uint32_t *clock_low, uint64_t clock_reg; mode_t save_umask; int len; + int sc; if (state_fd == -2) { save_umask = umask(0); @@ -426,7 +430,8 @@ try_again: } rewind(state_f); fl.l_type = F_UNLCK; - fcntl(state_fd, F_SETLK, &fl); + sc = fcntl(state_fd, F_SETLK, &fl); + _Assert_Unused_variable_unequal(sc, -1); } *clock_high = clock_reg >> 32; -- cgit v1.2.3