From 7b1b1772f0a242d0975581e9225723f262a7a5f7 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 12 May 2017 23:15:59 +0000 Subject: bugfixes: fd leak in s6-rc-oneshot-run, and missing coe in s6rc_lock --- src/libs6rc/s6rc_lock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/libs6rc') diff --git a/src/libs6rc/s6rc_lock.c b/src/libs6rc/s6rc_lock.c index 2a623d0..43b60bb 100644 --- a/src/libs6rc/s6rc_lock.c +++ b/src/libs6rc/s6rc_lock.c @@ -28,6 +28,7 @@ int s6rc_lock (char const *live, int lwhat, int *llfd, char const *compiled, int memcpy(lfn + llen, "/lock", 6) ; lfd = open_create(lfn) ; if (lfd < 0) return 0 ; + if (coe(lfd) < 0) { e = errno ; goto lerr ; } if ((lwhat > 1 ? lockex(lfd, blocking) : locksh(lfd, blocking)) < 0) { e = errno ; goto lerr ; } } @@ -41,7 +42,11 @@ int s6rc_lock (char const *live, int lwhat, int *llfd, char const *compiled, int if (cfd < 0) if (cwhat > 1 || errno != EROFS) { e = errno ; goto lerr ; } else cfd = -errno ; - else if ((cwhat > 1 ? lockex(cfd, blocking) : locksh(cfd, blocking)) < 0) { e = errno ; goto cerr ; } + else + { + if (coe(cfd) < 0) { e = errno ; goto cerr ; } + if ((cwhat > 1 ? lockex(cfd, blocking) : locksh(cfd, blocking)) < 0) { e = errno ; goto cerr ; } + } } if (lwhat) *llfd = lfd ; -- cgit v1.2.3