sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Wrap setting leases in become_root()/unbecome_root() to ensure correct delivery of signals.

Browse Source 
Remove workaround for Linux kernel bug https://bugzilla.kernel.org/show_bug.cgi?id=43336
as we don't need to set capabilities when we're already root.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
This commit is contained in:
Jeremy Allison 2013-07-31 16:32:20 -07:00
parent 63db0694c4
commit 1af8b07929
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source3/smbd/oplock_linux.c
View File

@ -75,26 +75,33 @@ int linux_set_lease_sighandler(int fd)
int linux_setlease(int fd, int leasetype)
{
int ret;
int saved_errno;
/*
* Ensure the lease owner is root to allow
* correct delivery of lease-break signals.
*/
become_root();
/* First set the signal handler. */
if (linux_set_lease_sighandler(fd) == -1) {
return -1;
saved_errno = errno;
ret = -1;
goto out;
}
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);
if (ret == -1) {
saved_errno = errno;
}
out:
unbecome_root();
if (ret == -1) {
errno = saved_errno;
}
return ret;
}