From: Darrick J. Wong <djwong@xxxxxxxxxx> Add support for using flock() to protect the files opened by the Unix IO manager so that we can't mount the same fs multiple times. This also prevents systemd and udev from accessing the device while e2fsprogs is doing something with the device. Link: https://systemd.io/BLOCK_DEVICE_LOCKING/ Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx> --- lib/ext2fs/unix_io.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c index 2ee61395e1275f..4a841f7f2133d4 100644 --- a/lib/ext2fs/unix_io.c +++ b/lib/ext2fs/unix_io.c @@ -65,6 +65,12 @@ #include <pthread.h> #endif +#if defined(HAVE_SYS_FILE_H) && defined(HAVE_SIGNAL_H) +# include <sys/file.h> +# include <signal.h> +# define WANT_LOCK_UNIX_FD +#endif + #if defined(__linux__) && defined(_IO) && !defined(BLKROGET) #define BLKROGET _IO(0x12, 94) /* Get read-only status (0 = read_write). */ #endif @@ -149,6 +155,9 @@ struct unix_private_data { pthread_mutex_t bounce_mutex; pthread_mutex_t stats_mutex; #endif +#ifdef WANT_LOCK_UNIX_FD + int lock_flags; +#endif }; #define IS_ALIGNED(n, align) ((((uintptr_t) n) & \ @@ -897,6 +906,47 @@ int ext2fs_fstat(int fd, ext2fs_struct_stat *buf) #endif } +#ifdef WANT_LOCK_UNIX_FD +static void unix_lock_alarm_handler(int signal, siginfo_t *data, void *p) +{ + /* do nothing, the signal will abort the flock operation */ +} + +static int unix_lock_fd(int fd, int flags) +{ + struct sigaction newsa = { + .sa_flags = SA_SIGINFO, + .sa_sigaction = unix_lock_alarm_handler, + }; + struct sigaction oldsa; + const int operation = (flags & IO_FLAG_EXCLUSIVE) ? LOCK_EX : LOCK_SH; + int ret; + + /* wait five seconds for the lock */ + ret = sigaction(SIGALRM, &newsa, &oldsa); + if (ret) + return ret; + + alarm(5); + + ret = flock(fd, operation); + if (ret == 0) + ret = operation; + else if (errno == EINTR) { + errno = EWOULDBLOCK; + ret = -1; + } + + alarm(0); + sigaction(SIGALRM, &oldsa, NULL); + return ret; +} + +static void unix_unlock_fd(int fd) +{ + flock(fd, LOCK_UN); +} +#endif static errcode_t unix_open_channel(const char *name, int fd, int flags, io_channel *channel, @@ -935,6 +985,16 @@ static errcode_t unix_open_channel(const char *name, int fd, if (retval) goto cleanup; +#ifdef WANT_LOCK_UNIX_FD + if (flags & IO_FLAG_RW) { + data->lock_flags = unix_lock_fd(fd, flags); + if (data->lock_flags < 0) { + retval = errno; + goto cleanup; + } + } +#endif + strcpy(io->name, name); io->private_data = data; io->block_size = 1024; @@ -1201,6 +1261,10 @@ static errcode_t unix_close(io_channel channel) if (retval2 && !retval) retval = retval2; +#ifdef WANT_LOCK_UNIX_FD + if (data->lock_flags) + unix_unlock_fd(data->dev); +#endif if (close(data->dev) < 0 && !retval) retval = errno; free_cache(data);
