57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
autofs-5.1.7 - fix lookup_prune_one_cache() refactoring change
|
|
|
|
From: Ian Kent <raven@themaw.net>
|
|
|
|
Commit 256963d6b (autofs-5.1.7 - refactor lookup_prune_one_cache() a bit)
|
|
changed the position of the getting the next enumeration map entry but
|
|
failed to update a couple of other locations that assume the next map
|
|
entry has been set. Under certain fairly common conditions this leads
|
|
to an infinite loop.
|
|
|
|
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
---
|
|
CHANGELOG | 1 +
|
|
daemon/lookup.c | 5 ++++-
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
--- autofs-5.1.4.orig/CHANGELOG
|
|
+++ autofs-5.1.4/CHANGELOG
|
|
@@ -73,6 +73,7 @@
|
|
- eliminate redundant cache lookup in tree_mapent_add_node().
|
|
- fix hosts map offset order.
|
|
- fix direct mount deadlock.
|
|
+- fix lookup_prune_one_cache() refactoring change.
|
|
|
|
xx/xx/2018 autofs-5.1.5
|
|
- fix flag file permission.
|
|
--- autofs-5.1.4.orig/daemon/lookup.c
|
|
+++ autofs-5.1.4/daemon/lookup.c
|
|
@@ -1387,6 +1387,7 @@ void lookup_prune_one_cache(struct autof
|
|
if (!key || strchr(key, '*')) {
|
|
if (key)
|
|
free(key);
|
|
+ me = cache_enumerate(mc, me);
|
|
continue;
|
|
}
|
|
|
|
@@ -1394,6 +1395,7 @@ void lookup_prune_one_cache(struct autof
|
|
if (!path) {
|
|
warn(ap->logopt, "can't malloc storage for path");
|
|
free(key);
|
|
+ me = cache_enumerate(mc, me);
|
|
continue;
|
|
}
|
|
|
|
@@ -1421,9 +1423,10 @@ void lookup_prune_one_cache(struct autof
|
|
}
|
|
if (!valid &&
|
|
is_mounted(path, MNTS_REAL)) {
|
|
- debug(ap->logopt, "prune posponed, %s mounted", path);
|
|
+ debug(ap->logopt, "prune postponed, %s mounted", path);
|
|
free(key);
|
|
free(path);
|
|
+ me = cache_enumerate(mc, me);
|
|
continue;
|
|
}
|
|
if (valid)
|