From: Ondřej Surý <ondrej@isc.org>
Date: Thu, 15 Aug 2024 07:23:31 +0000 (+0200)
Subject: Check the result of dirfd() before calling unlinkat()
X-Git-Tag: v9.21.1~40^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=59f4fdebc07441a5c7419488990f4b82c6a22eeb;p=thirdparty%2Fbind9.git

Check the result of dirfd() before calling unlinkat()

Instead of directly using the result of dirfd() in the unlinkat() call,
check whether the returned file descriptor is actually valid.  That
doesn't really change the logic as the unlinkat() would fail with
invalid descriptor anyway, but this is cleaner and will report the right
error returned directly by dirfd() instead of EBADF from unlinkat().
---

diff --git a/lib/isc/log.c b/lib/isc/log.c
index 40bb7fbb329..71fa5365c1e 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1037,8 +1037,10 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) {
 			 * Remove any backup files that exceed versions.
 			 */
 			if (*digit_end == '\0' && version >= versions) {
-				int n = unlinkat(dirfd(dir.handle),
-						 dir.entry.name, 0);
+				int n = dirfd(dir.handle);
+				if (n >= 0) {
+					n = unlinkat(n, dir.entry.name, 0);
+				}
 				if (n < 0) {
 					result = isc_errno_toresult(errno);
 					if (result != ISC_R_SUCCESS &&
@@ -1184,8 +1186,10 @@ remove_old_tsversions(isc_logfile_t *file, int versions) {
 			 * Remove any backup files that exceed versions.
 			 */
 			if (*digit_end == '\0' && version < last) {
-				int n = unlinkat(dirfd(dir.handle),
-						 dir.entry.name, 0);
+				int n = dirfd(dir.handle);
+				if (n >= 0) {
+					n = unlinkat(n, dir.entry.name, 0);
+				}
 				if (n < 0) {
 					result = isc_errno_toresult(errno);
 					if (result != ISC_R_SUCCESS &&