From a50fae46f3c7ab39adba9b4633dd483e6273f915 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 20 Jun 2012 15:50:00 -0700 Subject: [PATCH] Fix bug #8974 - Kernel oplocks are broken when uid(file) != uid(process). Based on a fix from "Etienne Dechamps " (cherry picked from commit 0e2fb6c69e971c7502fabe17fa71d1453dda18a6) (cherry picked from commit 92b1d6b93571facbb07b7d32f169ba32ef6f8e1f) --- source3/modules/vfs_default.c | 5 ----- source3/smbd/oplock_linux.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 60b85d9730c..0a341981740 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -1133,11 +1133,6 @@ static int vfswrap_linux_setlease(vfs_handle_struct *handle, files_struct *fsp, START_PROFILE(syscall_linux_setlease); #ifdef HAVE_KERNEL_OPLOCKS_LINUX - /* first set the signal handler */ - if(linux_set_lease_sighandler(fsp->fh->fd) == -1) { - return -1; - } - result = linux_setlease(fsp->fh->fd, leasetype); #else errno = ENOSYS; diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c index c60c7451771..ff5d5961b7b 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -74,9 +74,22 @@ int linux_setlease(int fd, int leasetype) { int ret; + /* First set the signal handler. */ + if (linux_set_lease_sighandler(fd) == -1) { + return -1; + } ret = fcntl(fd, F_SETLEASE, leasetype); if (ret == -1 && errno == EACCES) { set_effective_capability(LEASE_CAPABILITY); + /* + * Bug 8974 - work around Linux kernel bug + * https://bugzilla.kernel.org/show_bug.cgi?id=43336. + * "fcntl(F_SETLEASE) resets signal number when + * called multiple times" + */ + if (linux_set_lease_sighandler(fd) == -1) { + return -1; + } ret = fcntl(fd, F_SETLEASE, leasetype); } -- 2.34.1