Blame autofs-5.1.4-fix-deadlock-in-dumpmaps.patch
|
Ian Kent |
d25689 |
autofs-5.1.4 - fix deadlock in dumpmaps
|
|
Ian Kent |
d25689 |
|
|
Ian Kent |
d25689 |
From: Ian Kent <raven@themaw.net>
|
|
Ian Kent |
d25689 |
|
|
Ian Kent |
d25689 |
Commit a223d11fa8e (autofs-5.1.3 - serialize calls to open_xxxx()
|
|
Ian Kent |
d25689 |
functions) introduces a deadlock when using the dumpmaps function.
|
|
Ian Kent |
d25689 |
|
|
Ian Kent |
d25689 |
In this case the open fd mutex needs to be unlocked in the forked
|
|
Ian Kent |
d25689 |
child process of the do_spawn() function.
|
|
Ian Kent |
d25689 |
|
|
Ian Kent |
d25689 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
Ian Kent |
d25689 |
---
|
|
Ian Kent |
d25689 |
CHANGELOG | 1 +
|
|
Ian Kent |
d25689 |
daemon/spawn.c | 1 +
|
|
Ian Kent |
d25689 |
2 files changed, 2 insertions(+)
|
|
Ian Kent |
d25689 |
|
|
Ian Kent |
d25689 |
--- autofs-5.1.4.orig/CHANGELOG
|
|
Ian Kent |
d25689 |
+++ autofs-5.1.4/CHANGELOG
|
|
Ian Kent |
d25689 |
@@ -62,6 +62,7 @@
|
|
Ian Kent |
d25689 |
- fix incorrect check in validate_program_options().
|
|
Ian Kent |
d25689 |
- fix log message in spawn_umount().
|
|
Ian Kent |
d25689 |
- workaround getaddrinfo(3) ai_canonname bug
|
|
Ian Kent |
d25689 |
+- fix deadlock in dumpmaps.
|
|
Ian Kent |
d25689 |
|
|
Ian Kent |
d25689 |
24/05/2017 autofs-5.1.3
|
|
Ian Kent |
d25689 |
=======================
|
|
Ian Kent |
d25689 |
--- autofs-5.1.4.orig/daemon/spawn.c
|
|
Ian Kent |
d25689 |
+++ autofs-5.1.4/daemon/spawn.c
|
|
Ian Kent |
d25689 |
@@ -338,6 +338,7 @@ static int do_spawn(unsigned logopt, uns
|
|
Ian Kent |
d25689 |
dup2(pipefd[1], STDOUT_FILENO);
|
|
Ian Kent |
d25689 |
dup2(pipefd[1], STDERR_FILENO);
|
|
Ian Kent |
d25689 |
close(pipefd[1]);
|
|
Ian Kent |
d25689 |
+ open_mutex_unlock();
|
|
Ian Kent |
d25689 |
|
|
Ian Kent |
d25689 |
/* what to mount must always be second last */
|
|
Ian Kent |
d25689 |
while (*pargv++)
|