shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Fix dm_create_lockfile error paths - incorrectly unlinked in-use lockfile.

Browse Source 
(Jan Friesse)
This commit is contained in:
Alasdair Kergon 2010-07-27 21:56:14 +00:00
parent 8b90730e41
commit 4cc5adf46c
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libdm/libdm-file.c
View File

@ -104,21 +104,29 @@ int dm_create_lockfile(const char *lockfile)
lock.l_start = 0; lock.l_start = 0;
lock.l_whence = SEEK_SET; lock.l_whence = SEEK_SET;
lock.l_len = 0; lock.l_len = 0;
retry_fcntl:
if (fcntl(fd, F_SETLK, &lock) < 0) { if (fcntl(fd, F_SETLK, &lock) < 0) {
if (errno != EACCES && errno != EAGAIN) switch (errno) {
case EINTR:
goto retry_fcntl;
break;
case EACCES:
case EAGAIN:
log_error("Cannot lock lockfile [%s], error was [%s]", log_error("Cannot lock lockfile [%s], error was [%s]",
lockfile, strerror(errno)); lockfile, strerror(errno));
else break;
default:
log_error("process is already running"); log_error("process is already running");
}
goto fail; goto fail_close;
} }
if (ftruncate(fd, 0) < 0) { if (ftruncate(fd, 0) < 0) {
log_error("Cannot truncate pidfile [%s], error was [%s]", log_error("Cannot truncate pidfile [%s], error was [%s]",
lockfile, strerror(errno)); lockfile, strerror(errno));
goto fail; goto fail_close_unlink;
} }
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
@ -131,7 +139,7 @@ int dm_create_lockfile(const char *lockfile)
log_error("Cannot write pid to pidfile [%s], error was [%s]", log_error("Cannot write pid to pidfile [%s], error was [%s]",
lockfile, strerror(errno)); lockfile, strerror(errno));
goto fail; goto fail_close_unlink;
} }
if ((write_out == 0) || (write_out < bufferlen)) { if ((write_out == 0) || (write_out < bufferlen)) {
@ -139,30 +147,31 @@ int dm_create_lockfile(const char *lockfile)
"[%" PRIsize_t "] bytes, expected [%" PRIsize_t "]\n", "[%" PRIsize_t "] bytes, expected [%" PRIsize_t "]\n",
lockfile, write_out, bufferlen); lockfile, write_out, bufferlen);
goto fail; goto fail_close_unlink;
} }
if ((value = fcntl(fd, F_GETFD, 0)) < 0) { if ((value = fcntl(fd, F_GETFD, 0)) < 0) {
log_error("Cannot get close-on-exec flag from pidfile [%s], " log_error("Cannot get close-on-exec flag from pidfile [%s], "
"error was [%s]", lockfile, strerror(errno)); "error was [%s]", lockfile, strerror(errno));
goto fail; goto fail_close_unlink;
} }
value |= FD_CLOEXEC; value |= FD_CLOEXEC;
if (fcntl(fd, F_SETFD, value) < 0) { if (fcntl(fd, F_SETFD, value) < 0) {
log_error("Cannot set close-on-exec flag from pidfile [%s], " log_error("Cannot set close-on-exec flag from pidfile [%s], "
"error was [%s]", lockfile, strerror(errno)); "error was [%s]", lockfile, strerror(errno));
goto fail; goto fail_close_unlink;
} }
return 1; return 1;
fail: fail_close_unlink:
if (close(fd))
stack;
if (unlink(lockfile)) if (unlink(lockfile))
stack; stack;
fail_close:
if (close(fd))
stack;
return 0; return 0;
} }