diff options
| author | Jeremy Allison <jra@samba.org> | 2012-06-20 15:50:00 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-06-21 21:53:58 +0200 |
| commit | dd763d6d8e999b03164cef79a97c1350a556fef7 (patch) | |
| tree | f76141216978db02606c6a2d36549cca93668a5f /source3 | |
| parent | 7b43053ad6d1ee00895f592e7524c8591894144b (diff) | |
| download | samba-dd763d6d8e999b03164cef79a97c1350a556fef7.tar.gz samba-dd763d6d8e999b03164cef79a97c1350a556fef7.tar.bz2 samba-dd763d6d8e999b03164cef79a97c1350a556fef7.zip | |
Fix bug #8974 - Kernel oplocks are broken when uid(file) != uid(process).
Based on a fix from "Etienne Dechamps " <e-t172@akegroup.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Jun 21 21:53:58 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/vfs_default.c | 5 | ||||
| -rw-r--r-- | 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 b387cce109..eb3e343495 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -1573,11 +1573,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 190578e0cc..7fa9b7cb2c 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -76,9 +76,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); } |