autofs-5.1.9 - fix remount_active_mount() not remounting symlinks From: Ian Kent In remount_active_mount() there's a check if the path has an active mount (ie. covered). This is meant to check if the mount is a direct mount with an active mount to decide if the file descriptor needs to be retained or not. But this check gets it worng if the path is an indirect mount that contains symlinks and causes them to not be properly expired after the re-mount. Signed-off-by: Ian Kent --- CHANGELOG | 1 + lib/mounts.c | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a80be08a5..920e99503 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -23,6 +23,7 @@ - fix memory leak in cache_release(). - fix submount shutdown race. - fix lookup search type in umount_subtree_mounts(). +- fix remount_active_mount() not remounting symlinks. 02/11/2023 autofs-5.1.9 - fix kernel mount status notification. diff --git a/lib/mounts.c b/lib/mounts.c index b49227ea2..b87e79a27 100644 --- a/lib/mounts.c +++ b/lib/mounts.c @@ -2802,16 +2802,14 @@ static int remount_active_mount(struct autofs_point *ap, ops->close(ap->logopt, fd); return REMOUNT_FAIL; } - if (!mounted) { + if (!mounted && type != t_indirect) { /* * If we're an indirect mount we pass back the fd. - * But if were a direct or offset mount with no active - * mount we don't retain an open file descriptor. + * But if we're a direct or offset mount with no active + * mount we don't retain the open file descriptor. */ - if (type != t_indirect) { - ops->close(ap->logopt, fd); - *ioctlfd = -1; - } + ops->close(ap->logopt, fd); + *ioctlfd = -1; } else { /* * What can I do if we can't remount the existing