isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set errno to EINVAL if sudo_lock_* is called with a bad type.

Browse Source
This commit is contained in:
Todd C. Miller
2015-09-07 06:06:08 -06:00
parent 0487b6da9d
commit 448b18de2b
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/util/locking.c
View File

@@ -29,14 +29,15 @@
#ifdef HAVE_STRINGS_H #ifdef HAVE_STRINGS_H
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRING_H */ #endif /* HAVE_STRING_H */
#include <ctype.h>
#include <unistd.h>
#include <fcntl.h>
#ifdef HAVE_STDBOOL_H #ifdef HAVE_STDBOOL_H
# include <stdbool.h> # include <stdbool.h>
#else #else
# include "compat/stdbool.h" # include "compat/stdbool.h"
#endif #endif
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include "sudo_compat.h" #include "sudo_compat.h"
#include "sudo_util.h" #include "sudo_util.h"
@@ -69,6 +70,7 @@ sudo_lock_region_v1(int fd, int type, off_t len)
op = F_ULOCK; op = F_ULOCK;
break; break;
default: default:
errno = EINVAL;
debug_return_bool(false); debug_return_bool(false);
} }
debug_return_bool(lockf(fd, op, len) == 0); debug_return_bool(lockf(fd, op, len) == 0);
@@ -83,16 +85,31 @@ sudo_lock_file_v1(int fd, int type)
bool bool
sudo_lock_region_v1(int fd, int type, off_t len) sudo_lock_region_v1(int fd, int type, off_t len)
{ {
int func;
struct flock lock; struct flock lock;
int func;
debug_decl(sudo_lock_file, SUDO_DEBUG_UTIL) debug_decl(sudo_lock_file, SUDO_DEBUG_UTIL)
switch (type) {
case SUDO_LOCK:
lock.l_type = F_WRLCK;
func = F_SETLKW;
break;
case SUDO_TLOCK:
lock.l_type = F_WRLCK;
func = F_SETLK;
break;
case SUDO_UNLOCK:
lock.l_type = F_UNLCK;
func = F_SETLK;
break;
default:
errno = EINVAL;
debug_return_bool(false);
}
lock.l_start = 0; lock.l_start = 0;
lock.l_len = len; lock.l_len = len;
lock.l_pid = 0; lock.l_pid = 0;
lock.l_type = (type == SUDO_UNLOCK) ? F_UNLCK : F_WRLCK;
lock.l_whence = len ? SEEK_CUR : SEEK_SET; lock.l_whence = len ? SEEK_CUR : SEEK_SET;
func = (type == SUDO_LOCK) ? F_SETLKW : F_SETLK;
debug_return_bool(fcntl(fd, func, &lock) == 0); debug_return_bool(fcntl(fd, func, &lock) == 0);
} }