]> xenbits.xensource.com Git - xen.git/commitdiff
libxl: avoid infinite loop in libxl__remove_directory()
authorJan Beulich <jbeulich@suse.com>
Thu, 20 Mar 2025 11:53:51 +0000 (12:53 +0100)
committerJan Beulich <jbeulich@suse.com>
Thu, 20 Mar 2025 11:53:51 +0000 (12:53 +0100)
Infinitely retrying the rmdir() invocation makes little sense. While the
original observation was the log filling the disk (due to repeated
"Directory not empty" errors, in turn occurring for unclear reasons),
the loop wants breaking even if there was no error message being logged
(much like is done in the similar loops in libxl__remove_file() and
libxl__remove_file_or_directory()).

Fixes: c4dcbee67e6d ("libxl: provide libxl__remove_file et al")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Acked-by: Anthony PERARD <anthony.perard@vates.tech>
master commit: 68baeb5c4852e652b9599e049f40477edac4060e
master date: 2025-03-13 10:23:10 +0100

tools/libs/light/libxl_utils.c

index 506c5b5631dc952d44d423947d397d049d489d8b..5ae8935344c32ee3c6a7f3df4fdad3ee7c32aa79 100644 (file)
@@ -577,6 +577,7 @@ int libxl__remove_directory(libxl__gc *gc, const char *dirpath)
         if (errno == EINTR) continue;
         LOGE(ERROR, "failed to remove emptied directory %s", dirpath);
         rc = ERROR_FAIL;
+        break;
     }
 
  out: