mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 06:15:37 +00:00
Code Issues Releases Wiki Activity

Lock individual records in the timestamp file instead of the entire

Browse Source 
file.  This will make it possible for multiple sudo processes using
the same tty to serialize their timestamp lookups.
This commit is contained in:
Todd C. Miller
2015-09-07 06:06:08 -06:00
parent 98a15d9879
commit 00142c91fa
11 changed files with 422 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lib/util/locking.c
View File

@@ -22,9 +22,6 @@
#include <config.h>
#include <sys/types.h>
#ifdef HAVE_FLOCK
# include <sys/file.h>
#endif /* HAVE_FLOCK */
#include <stdlib.h>
#ifdef HAVE_STRING_H
# include <string.h>
@@ -46,16 +43,22 @@
#include "sudo_debug.h"
/*
* Lock/unlock a file.
* Lock/unlock all or part of a file.
*/
#ifdef HAVE_LOCKF
bool
sudo_lock_file_v1(int fd, int lockit)
sudo_lock_file_v1(int fd, int type)
{
int op = 0;
debug_decl(sudo_lock_file, SUDO_DEBUG_UTIL)
return sudo_lock_region_v1(fd, type, 0);
}
switch (lockit) {
bool
sudo_lock_region_v1(int fd, int type, off_t len)
{
int op;
debug_decl(sudo_lock_region, SUDO_DEBUG_UTIL)
switch (type) {
case SUDO_LOCK:
op = F_LOCK;
break;
@@ -65,48 +68,32 @@ sudo_lock_file_v1(int fd, int lockit)
case SUDO_UNLOCK:
op = F_ULOCK;
break;
default:
debug_return_bool(false);
}
debug_return_bool(lockf(fd, op, 0) == 0);
}
#elif defined(HAVE_FLOCK)
bool
sudo_lock_file_v1(int fd, int lockit)
{
int op = 0;
debug_decl(sudo_lock_file, SUDO_DEBUG_UTIL)
switch (lockit) {
case SUDO_LOCK:
op = LOCK_EX;
break;
case SUDO_TLOCK:
op = LOCK_EX | LOCK_NB;
break;
case SUDO_UNLOCK:
op = LOCK_UN;
break;
}
debug_return_bool(flock(fd, op) == 0);
debug_return_bool(lockf(fd, op, len) == 0);
}
#else
bool
sudo_lock_file_v1(int fd, int lockit)
sudo_lock_file_v1(int fd, int type)
{
return sudo_lock_region_v1(fd, type, 0);
}
bool
sudo_lock_region_v1(int fd, int type, off_t len)
{
#ifdef F_SETLK
int func;
struct flock lock;
debug_decl(sudo_lock_file, SUDO_DEBUG_UTIL)
lock.l_start = 0;
lock.l_len = 0;
lock.l_pid = getpid();
lock.l_type = (lockit == SUDO_UNLOCK) ? F_UNLCK : F_WRLCK;
lock.l_whence = SEEK_SET;
func = (lockit == SUDO_LOCK) ? F_SETLKW : F_SETLK;
lock.l_len = len;
lock.l_pid = 0;
lock.l_type = (type == SUDO_UNLOCK) ? F_UNLCK : F_WRLCK;
lock.l_whence = len ? SEEK_CUR : SEEK_SET;
func = (type == SUDO_LOCK) ? F_SETLKW : F_SETLK;
debug_return_bool(fcntl(fd, func, &lock) == 0);
#else
return true;
#endif
}
#endif