From 37608f911d6d046c968795e051f2ead8d04e58c0 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 21 Oct 2018 12:32:55 +0200 Subject: timerfd_create(): Fix error handling of osmo_fd_register() Change-Id: Ia2528cc3e3155bbc9cb32dee0e3af99cc6e1c654 Closes: Coverity CID#188853 --- src/select.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/select.c b/src/select.c index 0b115c61..b594ca55 100644 --- a/src/select.c +++ b/src/select.c @@ -324,11 +324,18 @@ int osmo_timerfd_setup(struct osmo_fd *ofd, int (*cb)(struct osmo_fd *, unsigned ofd->when = BSC_FD_READ; if (ofd->fd < 0) { + int rc; + ofd->fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK); if (ofd->fd < 0) return ofd->fd; - osmo_fd_register(ofd); + rc = osmo_fd_register(ofd); + if (rc < 0) { + close(ofd->fd); + ofd->fd = -1; + return rc; + } } return 0; } -- cgit v1.2.3