Skip to content

L
lxc
Commit dd1d77f9 by Andrey Mazo Committed by Serge Hallyn
Options

Remove process_lock() except where actually needed

Functions like open(), close(), socket(), socketpair(), pipe() and mkdir() are generally thin wrappers around kernel-provided system calls. It's the kernel not libc, who ensures race-free handling of file descriptors. Thus locking around these functions is unnecessary even on somewhat buggy libcs. fopen(), fclose() and other stdio functions may maintain internal lists of open file handles and thus can be prone to race-conditions. Hopefully, most libcs utilize proper locking or other ways to ensure thread-safety of these functions. Bionic used to have non-thread-safe stdio [2] but that must be fixed since android 4.3 [3, 4]. S.Çağlar Onur showed [1] that openpty() (because of nsswitch) is not thread-safe though. So we workaround it by protecting openpty() calls with process_lock()/process_unlock(). Because of the need to guard openpty() with process_lock()/process_unlock(), process_unlock() is still used after fork(). This commit reverts most of 025ed0f3. [1] https://github.com/lxc/lxc/pull/106#issuecomment-31077269 [2] https://bugzilla.mozilla.org/show_bug.cgi?id=687367 [3] https://android.googlesource.com/platform/bionic/+/f582340a6a48588aa50da17e1620e8f91b146941 [4] https://android.googlesource.com/platform/bionic/+/6b3f49a5374305ce9690c3c5ca2aadc90f54c521Signed-off-by: 's avatarAndrey Mazo <mazo@telum.ru> Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent e339d6b9
Showing with 10 additions and 535 deletions
src/lxc/af_unix.c
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <sys/un.h> #include <sys/un.h>
#include "log.h" #include "log.h"
#include "lxclock.h"
lxc_log_define(lxc_af_unix, lxc); lxc_log_define(lxc_af_unix, lxc);
...@@ -44,9 +43,7 @@ int lxc_abstract_unix_open(const char *path, int type, int flags) ...@@ -44,9 +43,7 @@ int lxc_abstract_unix_open(const char *path, int type, int flags)
if (flags & O_TRUNC) if (flags & O_TRUNC)
unlink(path); unlink(path);
process_lock();
fd = socket(PF_UNIX, type, 0); fd = socket(PF_UNIX, type, 0);
process_unlock();
if (fd < 0) if (fd < 0)
return -1; return -1;
...@@ -60,9 +57,7 @@ int lxc_abstract_unix_open(const char *path, int type, int flags) ...@@ -60,9 +57,7 @@ int lxc_abstract_unix_open(const char *path, int type, int flags)
len = strlen(&path[1]) + 1; len = strlen(&path[1]) + 1;
if (len >= sizeof(addr.sun_path) - 1) { if (len >= sizeof(addr.sun_path) - 1) {
process_lock();
close(fd); close(fd);
process_unlock();
errno = ENAMETOOLONG; errno = ENAMETOOLONG;
return -1; return -1;
} }
...@@ -71,18 +66,14 @@ int lxc_abstract_unix_open(const char *path, int type, int flags) ...@@ -71,18 +66,14 @@ int lxc_abstract_unix_open(const char *path, int type, int flags)
if (bind(fd, (struct sockaddr *)&addr, offsetof(struct sockaddr_un, sun_path) + len)) { if (bind(fd, (struct sockaddr *)&addr, offsetof(struct sockaddr_un, sun_path) + len)) {
int tmp = errno; int tmp = errno;
process_lock();
close(fd); close(fd);
process_unlock();
errno = tmp; errno = tmp;
return -1; return -1;
} }
if (type == SOCK_STREAM && listen(fd, 100)) { if (type == SOCK_STREAM && listen(fd, 100)) {
int tmp = errno; int tmp = errno;
process_lock();
close(fd); close(fd);
process_unlock();
errno = tmp; errno = tmp;
return -1; return -1;
} }
...@@ -99,9 +90,7 @@ int lxc_abstract_unix_close(int fd) ...@@ -99,9 +90,7 @@ int lxc_abstract_unix_close(int fd)
addr.sun_path[0]) addr.sun_path[0])
unlink(addr.sun_path); unlink(addr.sun_path);
process_lock();
close(fd); close(fd);
process_unlock();
return 0; return 0;
} }
...@@ -112,9 +101,7 @@ int lxc_abstract_unix_connect(const char *path) ...@@ -112,9 +101,7 @@ int lxc_abstract_unix_connect(const char *path)
size_t len; size_t len;
struct sockaddr_un addr; struct sockaddr_un addr;
process_lock();
fd = socket(PF_UNIX, SOCK_STREAM, 0); fd = socket(PF_UNIX, SOCK_STREAM, 0);
process_unlock();
if (fd < 0) if (fd < 0)
return -1; return -1;
...@@ -124,9 +111,7 @@ int lxc_abstract_unix_connect(const char *path) ...@@ -124,9 +111,7 @@ int lxc_abstract_unix_connect(const char *path)
len = strlen(&path[1]) + 1; len = strlen(&path[1]) + 1;
if (len >= sizeof(addr.sun_path) - 1) { if (len >= sizeof(addr.sun_path) - 1) {
process_lock();
close(fd); close(fd);
process_unlock();
errno = ENAMETOOLONG; errno = ENAMETOOLONG;
return -1; return -1;
} }
...@@ -138,9 +123,7 @@ int lxc_abstract_unix_connect(const char *path) ...@@ -138,9 +123,7 @@ int lxc_abstract_unix_connect(const char *path)
/* special case to connect to older containers */ /* special case to connect to older containers */
if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == 0) if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == 0)
return fd; return fd;
process_lock();
close(fd); close(fd);
process_unlock();
errno = tmp; errno = tmp;
return -1; return -1;
} }
......
src/lxc/attach.c
...@@ -79,9 +79,7 @@ struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid) ...@@ -79,9 +79,7 @@ struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid)
/* read capabilities */ /* read capabilities */
snprintf(proc_fn, MAXPATHLEN, "/proc/%d/status", pid); snprintf(proc_fn, MAXPATHLEN, "/proc/%d/status", pid);
process_lock();
proc_file = fopen(proc_fn, "r"); proc_file = fopen(proc_fn, "r");
process_unlock();
if (!proc_file) { if (!proc_file) {
SYSERROR("Could not open %s", proc_fn); SYSERROR("Could not open %s", proc_fn);
goto out_error; goto out_error;
...@@ -98,9 +96,7 @@ struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid) ...@@ -98,9 +96,7 @@ struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid)
if (line) if (line)
free(line); free(line);
process_lock();
fclose(proc_file); fclose(proc_file);
process_unlock();
if (!found) { if (!found) {
SYSERROR("Could not read capability bounding set from %s", proc_fn); SYSERROR("Could not read capability bounding set from %s", proc_fn);
...@@ -111,18 +107,14 @@ struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid) ...@@ -111,18 +107,14 @@ struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid)
/* read personality */ /* read personality */
snprintf(proc_fn, MAXPATHLEN, "/proc/%d/personality", pid); snprintf(proc_fn, MAXPATHLEN, "/proc/%d/personality", pid);
process_lock();
proc_file = fopen(proc_fn, "r"); proc_file = fopen(proc_fn, "r");
process_unlock();
if (!proc_file) { if (!proc_file) {
SYSERROR("Could not open %s", proc_fn); SYSERROR("Could not open %s", proc_fn);
goto out_error; goto out_error;
} }
ret = fscanf(proc_file, "%lx", &info->personality); ret = fscanf(proc_file, "%lx", &info->personality);
process_lock();
fclose(proc_file); fclose(proc_file);
process_unlock();
if (ret == EOF || ret == 0) { if (ret == EOF || ret == 0) {
SYSERROR("Could not read personality from %s", proc_fn); SYSERROR("Could not read personality from %s", proc_fn);
...@@ -178,19 +170,15 @@ int lxc_attach_to_ns(pid_t pid, int which) ...@@ -178,19 +170,15 @@ int lxc_attach_to_ns(pid_t pid, int which)
} }
snprintf(path, MAXPATHLEN, "/proc/%d/ns/%s", pid, ns[i]); snprintf(path, MAXPATHLEN, "/proc/%d/ns/%s", pid, ns[i]);
process_lock();
fd[i] = open(path, O_RDONLY | O_CLOEXEC); fd[i] = open(path, O_RDONLY | O_CLOEXEC);
process_unlock();
if (fd[i] < 0) { if (fd[i] < 0) {
saved_errno = errno; saved_errno = errno;
/* close all already opened file descriptors before /* close all already opened file descriptors before
* we return an error, so we don't leak them * we return an error, so we don't leak them
*/ */
process_lock();
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
close(fd[j]); close(fd[j]);
process_unlock();
errno = saved_errno; errno = saved_errno;
SYSERROR("failed to open '%s'", path); SYSERROR("failed to open '%s'", path);
...@@ -210,9 +198,7 @@ int lxc_attach_to_ns(pid_t pid, int which) ...@@ -210,9 +198,7 @@ int lxc_attach_to_ns(pid_t pid, int which)
return -1; return -1;
} }
process_lock();
close(fd[i]); close(fd[i]);
process_unlock();
} }
return 0; return 0;
...@@ -400,18 +386,14 @@ char *lxc_attach_getpwshell(uid_t uid) ...@@ -400,18 +386,14 @@ char *lxc_attach_getpwshell(uid_t uid)
* getent program, and we need to capture its * getent program, and we need to capture its
* output, so we use a pipe for that purpose * output, so we use a pipe for that purpose
*/ */
process_lock();
ret = pipe(pipes); ret = pipe(pipes);
process_unlock();
if (ret < 0) if (ret < 0)
return NULL; return NULL;
pid = fork(); pid = fork();
if (pid < 0) { if (pid < 0) {
process_lock();
close(pipes[0]); close(pipes[0]);
close(pipes[1]); close(pipes[1]);
process_unlock();
return NULL; return NULL;
} }
...@@ -423,13 +405,9 @@ char *lxc_attach_getpwshell(uid_t uid) ...@@ -423,13 +405,9 @@ char *lxc_attach_getpwshell(uid_t uid)
int found = 0; int found = 0;
int status; int status;
process_lock();
close(pipes[1]); close(pipes[1]);
process_unlock();
process_lock();
pipe_f = fdopen(pipes[0], "r"); pipe_f = fdopen(pipes[0], "r");
process_unlock();
while (getline(&line, &line_bufsz, pipe_f) != -1) { while (getline(&line, &line_bufsz, pipe_f) != -1) {
char *token; char *token;
char *saveptr = NULL; char *saveptr = NULL;
...@@ -486,9 +464,7 @@ char *lxc_attach_getpwshell(uid_t uid) ...@@ -486,9 +464,7 @@ char *lxc_attach_getpwshell(uid_t uid)
} }
free(line); free(line);
process_lock();
fclose(pipe_f); fclose(pipe_f);
process_unlock();
again: again:
if (waitpid(pid, &status, 0) < 0) { if (waitpid(pid, &status, 0) < 0) {
if (errno == EINTR) if (errno == EINTR)
...@@ -683,9 +659,7 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun ...@@ -683,9 +659,7 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun
* close socket close socket * close socket close socket
* run program * run program
*/ */
process_lock();
ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets); ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);
process_unlock();
if (ret < 0) { if (ret < 0) {
SYSERROR("could not set up required IPC mechanism for attaching"); SYSERROR("could not set up required IPC mechanism for attaching");
free(cwd); free(cwd);
...@@ -721,9 +695,7 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun ...@@ -721,9 +695,7 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun
/* inital thread, we close the socket that is for the /* inital thread, we close the socket that is for the
* subprocesses * subprocesses
*/ */
process_lock();
close(ipc_sockets[1]); close(ipc_sockets[1]);
process_unlock();
free(cwd); free(cwd);
/* get pid from intermediate process */ /* get pid from intermediate process */
...@@ -795,9 +767,7 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun ...@@ -795,9 +767,7 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun
/* now shut down communication with child, we're done */ /* now shut down communication with child, we're done */
shutdown(ipc_sockets[0], SHUT_RDWR); shutdown(ipc_sockets[0], SHUT_RDWR);
process_lock();
close(ipc_sockets[0]); close(ipc_sockets[0]);
process_unlock();
lxc_proc_put_context_info(init_ctx); lxc_proc_put_context_info(init_ctx);
/* we're done, the child process should now execute whatever /* we're done, the child process should now execute whatever
...@@ -813,9 +783,7 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun ...@@ -813,9 +783,7 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun
* otherwise the pid we're waiting for may never exit * otherwise the pid we're waiting for may never exit
*/ */
shutdown(ipc_sockets[0], SHUT_RDWR); shutdown(ipc_sockets[0], SHUT_RDWR);
process_lock();
close(ipc_sockets[0]); close(ipc_sockets[0]);
process_unlock();
if (to_cleanup_pid) if (to_cleanup_pid)
(void) wait_for_pid(to_cleanup_pid); (void) wait_for_pid(to_cleanup_pid);
lxc_proc_put_context_info(init_ctx); lxc_proc_put_context_info(init_ctx);
......
src/lxc/bdev.c
...@@ -96,15 +96,11 @@ static int blk_getsize(struct bdev *bdev, unsigned long *size) ...@@ -96,15 +96,11 @@ static int blk_getsize(struct bdev *bdev, unsigned long *size)
if (strcmp(bdev->type, "loop") == 0) if (strcmp(bdev->type, "loop") == 0)
path = bdev->src + 5; path = bdev->src + 5;
process_lock();
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
process_unlock();
if (fd < 0) if (fd < 0)
return -1; return -1;
ret = ioctl(fd, BLKGETSIZE64, size); ret = ioctl(fd, BLKGETSIZE64, size);
process_lock();
close(fd); close(fd);
process_unlock();
return ret; return ret;
} }
...@@ -260,23 +256,17 @@ static int detect_fs(struct bdev *bdev, char *type, int len) ...@@ -260,23 +256,17 @@ static int detect_fs(struct bdev *bdev, char *type, int len)
if (strcmp(bdev->type, "loop") == 0) if (strcmp(bdev->type, "loop") == 0)
srcdev = bdev->src + 5; srcdev = bdev->src + 5;
process_lock();
ret = pipe(p); ret = pipe(p);
process_unlock();
if (ret < 0) if (ret < 0)
return -1; return -1;
if ((pid = fork()) < 0) if ((pid = fork()) < 0)
return -1; return -1;
if (pid > 0) { if (pid > 0) {
int status; int status;
process_lock();
close(p[1]); close(p[1]);
process_unlock();
memset(type, 0, len); memset(type, 0, len);
ret = read(p[0], type, len-1); ret = read(p[0], type, len-1);
process_lock();
close(p[0]); close(p[0]);
process_unlock();
if (ret < 0) { if (ret < 0) {
SYSERROR("error reading from pipe"); SYSERROR("error reading from pipe");
wait(&status); wait(&status);
...@@ -504,9 +494,7 @@ static int zfs_list_entry(const char *path, char *output, size_t inlen) ...@@ -504,9 +494,7 @@ static int zfs_list_entry(const char *path, char *output, size_t inlen)
struct lxc_popen_FILE *f; struct lxc_popen_FILE *f;
int found=0; int found=0;
process_lock();
f = lxc_popen("zfs list 2> /dev/null"); f = lxc_popen("zfs list 2> /dev/null");
process_unlock();
if (f == NULL) { if (f == NULL) {
SYSERROR("popen failed"); SYSERROR("popen failed");
return 0; return 0;
...@@ -517,9 +505,7 @@ static int zfs_list_entry(const char *path, char *output, size_t inlen) ...@@ -517,9 +505,7 @@ static int zfs_list_entry(const char *path, char *output, size_t inlen)
break; break;
} }
} }
process_lock();
(void) lxc_pclose(f); (void) lxc_pclose(f);
process_unlock();
return found; return found;
} }
...@@ -778,15 +764,11 @@ static int lvm_detect(const char *path) ...@@ -778,15 +764,11 @@ static int lvm_detect(const char *path)
ERROR("lvm uuid pathname too long"); ERROR("lvm uuid pathname too long");
return 0; return 0;
} }
process_lock();
fout = fopen(devp, "r"); fout = fopen(devp, "r");
process_unlock();
if (!fout) if (!fout)
return 0; return 0;
ret = fread(buf, 1, 4, fout); ret = fread(buf, 1, 4, fout);
process_lock();
fclose(fout); fclose(fout);
process_unlock();
if (ret != 4 || strncmp(buf, "LVM-", 4) != 0) if (ret != 4 || strncmp(buf, "LVM-", 4) != 0)
return 0; return 0;
return 1; return 1;
...@@ -825,9 +807,7 @@ static int lvm_compare_lv_attr(const char *path, int pos, const char expected) { ...@@ -825,9 +807,7 @@ static int lvm_compare_lv_attr(const char *path, int pos, const char expected) {
if (ret < 0 || ret >= len) if (ret < 0 || ret >= len)
return -1; return -1;
process_lock();
f = lxc_popen(cmd); f = lxc_popen(cmd);
process_unlock();
if (f == NULL) { if (f == NULL) {
SYSERROR("popen failed"); SYSERROR("popen failed");
...@@ -836,9 +816,7 @@ static int lvm_compare_lv_attr(const char *path, int pos, const char expected) { ...@@ -836,9 +816,7 @@ static int lvm_compare_lv_attr(const char *path, int pos, const char expected) {
ret = fgets(output, 12, f->f) == NULL; ret = fgets(output, 12, f->f) == NULL;
process_lock();
status = lxc_pclose(f); status = lxc_pclose(f);
process_unlock();
if (ret || WEXITSTATUS(status)) if (ret || WEXITSTATUS(status))
// Assume either vg or lvs do not exist, default // Assume either vg or lvs do not exist, default
...@@ -1182,17 +1160,13 @@ static bool is_btrfs_fs(const char *path) ...@@ -1182,17 +1160,13 @@ static bool is_btrfs_fs(const char *path)
struct btrfs_ioctl_space_args sargs; struct btrfs_ioctl_space_args sargs;
// make sure this is a btrfs filesystem // make sure this is a btrfs filesystem
process_lock();
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
process_unlock();
if (fd < 0) if (fd < 0)
return false; return false;
sargs.space_slots = 0; sargs.space_slots = 0;
sargs.total_spaces = 0; sargs.total_spaces = 0;
ret = ioctl(fd, BTRFS_IOC_SPACE_INFO, &sargs); ret = ioctl(fd, BTRFS_IOC_SPACE_INFO, &sargs);
process_lock();
close(fd); close(fd);
process_unlock();
if (ret < 0) if (ret < 0)
return false; return false;
...@@ -1290,9 +1264,7 @@ static int btrfs_subvolume_create(const char *path) ...@@ -1290,9 +1264,7 @@ static int btrfs_subvolume_create(const char *path)
} }
*p = '\0'; *p = '\0';
process_lock();
fd = open(newfull, O_RDONLY); fd = open(newfull, O_RDONLY);
process_unlock();
if (fd < 0) { if (fd < 0) {
ERROR("Error opening %s", newfull); ERROR("Error opening %s", newfull);
free(newfull); free(newfull);
...@@ -1306,9 +1278,7 @@ static int btrfs_subvolume_create(const char *path) ...@@ -1306,9 +1278,7 @@ static int btrfs_subvolume_create(const char *path)
INFO("btrfs: snapshot create ioctl returned %d", ret); INFO("btrfs: snapshot create ioctl returned %d", ret);
free(newfull); free(newfull);
process_lock();
close(fd); close(fd);
process_unlock();
return ret; return ret;
} }
...@@ -1330,14 +1300,12 @@ static int btrfs_snapshot(const char *orig, const char *new) ...@@ -1330,14 +1300,12 @@ static int btrfs_snapshot(const char *orig, const char *new)
} }
newname = basename(newfull); newname = basename(newfull);
newdir = dirname(newfull); newdir = dirname(newfull);
process_lock();
fd = open(orig, O_RDONLY); fd = open(orig, O_RDONLY);
fddst = open(newdir, O_RDONLY);
process_unlock();
if (fd < 0) { if (fd < 0) {
SYSERROR("Error opening original rootfs %s", orig); SYSERROR("Error opening original rootfs %s", orig);
goto out; goto out;
} }
fddst = open(newdir, O_RDONLY);
if (fddst < 0) { if (fddst < 0) {
SYSERROR("Error opening new container dir %s", newdir); SYSERROR("Error opening new container dir %s", newdir);
goto out; goto out;
...@@ -1351,12 +1319,10 @@ static int btrfs_snapshot(const char *orig, const char *new) ...@@ -1351,12 +1319,10 @@ static int btrfs_snapshot(const char *orig, const char *new)
INFO("btrfs: snapshot create ioctl returned %d", ret); INFO("btrfs: snapshot create ioctl returned %d", ret);
out: out:
process_lock();
if (fddst != -1) if (fddst != -1)
close(fddst); close(fddst);
if (fd != -1) if (fd != -1)
close(fd); close(fd);
process_unlock();
if (newfull) if (newfull)
free(newfull); free(newfull);
return ret; return ret;
...@@ -1427,9 +1393,7 @@ static int btrfs_destroy(struct bdev *orig) ...@@ -1427,9 +1393,7 @@ static int btrfs_destroy(struct bdev *orig)
} }
*p = '\0'; *p = '\0';
process_lock();
fd = open(newfull, O_RDONLY); fd = open(newfull, O_RDONLY);
process_unlock();
if (fd < 0) { if (fd < 0) {
ERROR("Error opening %s", newfull); ERROR("Error opening %s", newfull);
free(newfull); free(newfull);
...@@ -1443,9 +1407,7 @@ static int btrfs_destroy(struct bdev *orig) ...@@ -1443,9 +1407,7 @@ static int btrfs_destroy(struct bdev *orig)
INFO("btrfs: snapshot create ioctl returned %d", ret); INFO("btrfs: snapshot create ioctl returned %d", ret);
free(newfull); free(newfull);
process_lock();
close(fd); close(fd);
process_unlock();
return ret; return ret;
} }
...@@ -1485,9 +1447,7 @@ static int find_free_loopdev(int *retfd, char *namep) ...@@ -1485,9 +1447,7 @@ static int find_free_loopdev(int *retfd, char *namep)
DIR *dir; DIR *dir;
int fd = -1; int fd = -1;
process_lock();
dir = opendir("/dev"); dir = opendir("/dev");
process_unlock();
if (!dir) { if (!dir) {
SYSERROR("Error opening /dev"); SYSERROR("Error opening /dev");
return -1; return -1;
...@@ -1498,15 +1458,11 @@ static int find_free_loopdev(int *retfd, char *namep) ...@@ -1498,15 +1458,11 @@ static int find_free_loopdev(int *retfd, char *namep)
break; break;
if (strncmp(direntp->d_name, "loop", 4) != 0) if (strncmp(direntp->d_name, "loop", 4) != 0)
continue; continue;
process_lock();
fd = openat(dirfd(dir), direntp->d_name, O_RDWR); fd = openat(dirfd(dir), direntp->d_name, O_RDWR);
process_unlock();
if (fd < 0) if (fd < 0)
continue; continue;
if (ioctl(fd, LOOP_GET_STATUS64, &lo) == 0 || errno != ENXIO) { if (ioctl(fd, LOOP_GET_STATUS64, &lo) == 0 || errno != ENXIO) {
process_lock();
close(fd); close(fd);
process_unlock();
fd = -1; fd = -1;
continue; continue;
} }
...@@ -1514,9 +1470,7 @@ static int find_free_loopdev(int *retfd, char *namep) ...@@ -1514,9 +1470,7 @@ static int find_free_loopdev(int *retfd, char *namep)
snprintf(namep, 100, "/dev/%s", direntp->d_name); snprintf(namep, 100, "/dev/%s", direntp->d_name);
break; break;
} }
process_lock();
closedir(dir); closedir(dir);
process_unlock();
if (fd == -1) { if (fd == -1) {
ERROR("No loop device found"); ERROR("No loop device found");
return -1; return -1;
...@@ -1539,9 +1493,7 @@ static int loop_mount(struct bdev *bdev) ...@@ -1539,9 +1493,7 @@ static int loop_mount(struct bdev *bdev)
if (find_free_loopdev(&lfd, loname) < 0) if (find_free_loopdev(&lfd, loname) < 0)
return -22; return -22;
process_lock();
ffd = open(bdev->src + 5, O_RDWR); ffd = open(bdev->src + 5, O_RDWR);
process_unlock();
if (ffd < 0) { if (ffd < 0) {
SYSERROR("Error opening backing file %s\n", bdev->src); SYSERROR("Error opening backing file %s\n", bdev->src);
goto out; goto out;
...@@ -1565,14 +1517,12 @@ static int loop_mount(struct bdev *bdev) ...@@ -1565,14 +1517,12 @@ static int loop_mount(struct bdev *bdev)
bdev->lofd = lfd; bdev->lofd = lfd;
out: out:
process_lock();
if (ffd > -1) if (ffd > -1)
close(ffd); close(ffd);
if (ret < 0) { if (ret < 0) {
close(lfd); close(lfd);
bdev->lofd = -1; bdev->lofd = -1;
} }
process_unlock();
return ret; return ret;
} }
...@@ -1586,9 +1536,7 @@ static int loop_umount(struct bdev *bdev) ...@@ -1586,9 +1536,7 @@ static int loop_umount(struct bdev *bdev)
return -22; return -22;
ret = umount(bdev->dest); ret = umount(bdev->dest);
if (bdev->lofd >= 0) { if (bdev->lofd >= 0) {
process_lock();
close(bdev->lofd); close(bdev->lofd);
process_unlock();
bdev->lofd = -1; bdev->lofd = -1;
} }
return ret; return ret;
...@@ -1598,9 +1546,7 @@ static int do_loop_create(const char *path, unsigned long size, const char *fsty ...@@ -1598,9 +1546,7 @@ static int do_loop_create(const char *path, unsigned long size, const char *fsty
{ {
int fd, ret; int fd, ret;
// create the new loopback file. // create the new loopback file.
process_lock();
fd = creat(path, S_IRUSR|S_IWUSR); fd = creat(path, S_IRUSR|S_IWUSR);
process_unlock();
if (fd < 0) if (fd < 0)
return -1; return -1;
if (lseek(fd, size, SEEK_SET) < 0) { if (lseek(fd, size, SEEK_SET) < 0) {
...@@ -1613,9 +1559,7 @@ static int do_loop_create(const char *path, unsigned long size, const char *fsty ...@@ -1613,9 +1559,7 @@ static int do_loop_create(const char *path, unsigned long size, const char *fsty
close(fd); close(fd);
return -1; return -1;
} }
process_lock();
ret = close(fd); ret = close(fd);
process_unlock();
if (ret < 0) { if (ret < 0) {
SYSERROR("Error closing new loop file"); SYSERROR("Error closing new loop file");
return -1; return -1;
......
src/lxc/caps.c
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "config.h" #include "config.h"
#include "log.h" #include "log.h"
#include "lxclock.h"
lxc_log_define(lxc_caps, lxc); lxc_log_define(lxc_caps, lxc);
...@@ -192,9 +191,7 @@ static int _real_caps_last_cap(void) ...@@ -192,9 +191,7 @@ static int _real_caps_last_cap(void)
/* try to get the maximum capability over the kernel /* try to get the maximum capability over the kernel
* interface introduced in v3.2 */ * interface introduced in v3.2 */
process_lock();
fd = open("/proc/sys/kernel/cap_last_cap", O_RDONLY); fd = open("/proc/sys/kernel/cap_last_cap", O_RDONLY);
process_unlock();
if (fd >= 0) { if (fd >= 0) {
char buf[32]; char buf[32];
char *ptr; char *ptr;
...@@ -208,9 +205,7 @@ static int _real_caps_last_cap(void) ...@@ -208,9 +205,7 @@ static int _real_caps_last_cap(void)
result = -1; result = -1;
} }
process_lock();
close(fd); close(fd);
process_unlock();
} }
/* try to get it manually by trying to get the status of /* try to get it manually by trying to get the status of
......
src/lxc/cgroup.c
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "conf.h" #include "conf.h"
#include "utils.h" #include "utils.h"
#include "bdev.h" #include "bdev.h"
#include "lxclock.h"
#include <lxc/log.h> #include <lxc/log.h>
#include <lxc/cgroup.h> #include <lxc/cgroup.h>
...@@ -118,9 +117,7 @@ static bool find_cgroup_subsystems(char ***kernel_subsystems) ...@@ -118,9 +117,7 @@ static bool find_cgroup_subsystems(char ***kernel_subsystems)
size_t kernel_subsystems_capacity = 0; size_t kernel_subsystems_capacity = 0;
int r; int r;
process_lock();
proc_cgroups = fopen_cloexec("/proc/cgroups", "r"); proc_cgroups = fopen_cloexec("/proc/cgroups", "r");
process_unlock();
if (!proc_cgroups) if (!proc_cgroups)
return false; return false;
...@@ -160,9 +157,7 @@ static bool find_cgroup_subsystems(char ***kernel_subsystems) ...@@ -160,9 +157,7 @@ static bool find_cgroup_subsystems(char ***kernel_subsystems)
bret = true; bret = true;
out: out:
process_lock();
fclose(proc_cgroups); fclose(proc_cgroups);
process_unlock();
free(line); free(line);
return bret; return bret;
} }
...@@ -182,13 +177,11 @@ static bool find_cgroup_hierarchies(struct cgroup_meta_data *meta_data, ...@@ -182,13 +177,11 @@ static bool find_cgroup_hierarchies(struct cgroup_meta_data *meta_data,
bool bret = false; bool bret = false;
size_t hierarchy_capacity = 0; size_t hierarchy_capacity = 0;
process_lock();
proc_self_cgroup = fopen_cloexec("/proc/self/cgroup", "r"); proc_self_cgroup = fopen_cloexec("/proc/self/cgroup", "r");
/* if for some reason (because of setns() and pid namespace for example), /* if for some reason (because of setns() and pid namespace for example),
* /proc/self is not valid, we try /proc/1/cgroup... */ * /proc/self is not valid, we try /proc/1/cgroup... */
if (!proc_self_cgroup) if (!proc_self_cgroup)
proc_self_cgroup = fopen_cloexec("/proc/1/cgroup", "r"); proc_self_cgroup = fopen_cloexec("/proc/1/cgroup", "r");
process_unlock();
if (!proc_self_cgroup) if (!proc_self_cgroup)
return false; return false;
...@@ -267,9 +260,7 @@ static bool find_cgroup_hierarchies(struct cgroup_meta_data *meta_data, ...@@ -267,9 +260,7 @@ static bool find_cgroup_hierarchies(struct cgroup_meta_data *meta_data,
bret = true; bret = true;
out: out:
process_lock();
fclose(proc_self_cgroup); fclose(proc_self_cgroup);
process_unlock();
free(line); free(line);
return bret; return bret;
} }
...@@ -287,13 +278,11 @@ static bool find_hierarchy_mountpts( struct cgroup_meta_data *meta_data, char ** ...@@ -287,13 +278,11 @@ static bool find_hierarchy_mountpts( struct cgroup_meta_data *meta_data, char **
size_t token_capacity = 0; size_t token_capacity = 0;
int r; int r;
process_lock();
proc_self_mountinfo = fopen_cloexec("/proc/self/mountinfo", "r"); proc_self_mountinfo = fopen_cloexec("/proc/self/mountinfo", "r");
/* if for some reason (because of setns() and pid namespace for example), /* if for some reason (because of setns() and pid namespace for example),
* /proc/self is not valid, we try /proc/1/cgroup... */ * /proc/self is not valid, we try /proc/1/cgroup... */
if (!proc_self_mountinfo) if (!proc_self_mountinfo)
proc_self_mountinfo = fopen_cloexec("/proc/1/mountinfo", "r"); proc_self_mountinfo = fopen_cloexec("/proc/1/mountinfo", "r");
process_unlock();
if (!proc_self_mountinfo) if (!proc_self_mountinfo)
return false; return false;
...@@ -398,9 +387,7 @@ static bool find_hierarchy_mountpts( struct cgroup_meta_data *meta_data, char ** ...@@ -398,9 +387,7 @@ static bool find_hierarchy_mountpts( struct cgroup_meta_data *meta_data, char **
bret = true; bret = true;
out: out:
process_lock();
fclose(proc_self_mountinfo); fclose(proc_self_mountinfo);
process_unlock();
free(tokens); free(tokens);
free(line); free(line);
return bret; return bret;
...@@ -1473,9 +1460,7 @@ struct cgroup_process_info *lxc_cgroup_process_info_getx(const char *proc_pid_cg ...@@ -1473,9 +1460,7 @@ struct cgroup_process_info *lxc_cgroup_process_info_getx(const char *proc_pid_cg
struct cgroup_process_info **cptr = &result; struct cgroup_process_info **cptr = &result;
struct cgroup_process_info *entry = NULL; struct cgroup_process_info *entry = NULL;
process_lock();
proc_pid_cgroup = fopen_cloexec(proc_pid_cgroup_str, "r"); proc_pid_cgroup = fopen_cloexec(proc_pid_cgroup_str, "r");
process_unlock();
if (!proc_pid_cgroup) if (!proc_pid_cgroup)
return NULL; return NULL;
...@@ -1545,18 +1530,14 @@ struct cgroup_process_info *lxc_cgroup_process_info_getx(const char *proc_pid_cg ...@@ -1545,18 +1530,14 @@ struct cgroup_process_info *lxc_cgroup_process_info_getx(const char *proc_pid_cg
entry = NULL; entry = NULL;
} }
process_lock();
fclose(proc_pid_cgroup); fclose(proc_pid_cgroup);
process_unlock();
free(line); free(line);
return result; return result;
out_error: out_error:
saved_errno = errno; saved_errno = errno;
process_lock();
if (proc_pid_cgroup) if (proc_pid_cgroup)
fclose(proc_pid_cgroup); fclose(proc_pid_cgroup);
process_unlock();
lxc_cgroup_process_info_free(result); lxc_cgroup_process_info_free(result);
lxc_cgroup_process_info_free(entry); lxc_cgroup_process_info_free(entry);
free(line); free(line);
...@@ -1817,9 +1798,7 @@ bool cgroup_devices_has_allow_or_deny(struct lxc_handler *h, char *v, bool for_a ...@@ -1817,9 +1798,7 @@ bool cgroup_devices_has_allow_or_deny(struct lxc_handler *h, char *v, bool for_a
return false; return false;
} }
process_lock();
devices_list = fopen_cloexec(path, "r"); devices_list = fopen_cloexec(path, "r");
process_unlock();
if (!devices_list) { if (!devices_list) {
free(path); free(path);
return false; return false;
...@@ -1839,9 +1818,7 @@ bool cgroup_devices_has_allow_or_deny(struct lxc_handler *h, char *v, bool for_a ...@@ -1839,9 +1818,7 @@ bool cgroup_devices_has_allow_or_deny(struct lxc_handler *h, char *v, bool for_a
} }
out: out:
process_lock();
fclose(devices_list); fclose(devices_list);
process_unlock();
free(line); free(line);
free(path); free(path);
return ret; return ret;
...@@ -1863,9 +1840,7 @@ int cgroup_recursive_task_count(const char *cgroup_path) ...@@ -1863,9 +1840,7 @@ int cgroup_recursive_task_count(const char *cgroup_path)
if (!dent_buf) if (!dent_buf)
return -1; return -1;
process_lock();
d = opendir(cgroup_path); d = opendir(cgroup_path);
process_unlock();
if (!d) { if (!d) {
free(dent_buf); free(dent_buf);
return 0; return 0;
...@@ -1884,17 +1859,13 @@ int cgroup_recursive_task_count(const char *cgroup_path) ...@@ -1884,17 +1859,13 @@ int cgroup_recursive_task_count(const char *cgroup_path)
continue; continue;
sub_path = lxc_string_join("/", parts, false); sub_path = lxc_string_join("/", parts, false);
if (!sub_path) { if (!sub_path) {
process_lock();
closedir(d); closedir(d);
process_unlock();
free(dent_buf); free(dent_buf);
return -1; return -1;
} }
r = stat(sub_path, &st); r = stat(sub_path, &st);
if (r < 0) { if (r < 0) {
process_lock();
closedir(d); closedir(d);
process_unlock();
free(dent_buf); free(dent_buf);
free(sub_path); free(sub_path);
return -1; return -1;
...@@ -1910,9 +1881,7 @@ int cgroup_recursive_task_count(const char *cgroup_path) ...@@ -1910,9 +1881,7 @@ int cgroup_recursive_task_count(const char *cgroup_path)
} }
free(sub_path); free(sub_path);
} }
process_lock();
closedir(d); closedir(d);
process_unlock();
free(dent_buf); free(dent_buf);
return n; return n;
...@@ -1925,9 +1894,7 @@ int count_lines(const char *fn) ...@@ -1925,9 +1894,7 @@ int count_lines(const char *fn)
size_t sz = 0; size_t sz = 0;
int n = 0; int n = 0;
process_lock();
f = fopen_cloexec(fn, "r"); f = fopen_cloexec(fn, "r");
process_unlock();
if (!f) if (!f)
return -1; return -1;
...@@ -1935,9 +1902,7 @@ int count_lines(const char *fn) ...@@ -1935,9 +1902,7 @@ int count_lines(const char *fn)
n++; n++;
} }
free(line); free(line);
process_lock();
fclose(f); fclose(f);
process_unlock();
return n; return n;
} }
......
src/lxc/commands.c
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include "mainloop.h" #include "mainloop.h"
#include "af_unix.h" #include "af_unix.h"
#include "config.h" #include "config.h"
#include "lxclock.h"
/* /*
* This file provides the different functions for clients to * This file provides the different functions for clients to
...@@ -749,9 +748,7 @@ static void lxc_cmd_fd_cleanup(int fd, struct lxc_handler *handler, ...@@ -749,9 +748,7 @@ static void lxc_cmd_fd_cleanup(int fd, struct lxc_handler *handler,
{ {
lxc_console_free(handler->conf, fd); lxc_console_free(handler->conf, fd);
lxc_mainloop_del_handler(descr, fd); lxc_mainloop_del_handler(descr, fd);
process_lock();
close(fd); close(fd);
process_unlock();
} }
static int lxc_cmd_handler(int fd, uint32_t events, void *data, static int lxc_cmd_handler(int fd, uint32_t events, void *data,
...@@ -824,9 +821,7 @@ static int lxc_cmd_accept(int fd, uint32_t events, void *data, ...@@ -824,9 +821,7 @@ static int lxc_cmd_accept(int fd, uint32_t events, void *data,
{ {
int opt = 1, ret = -1, connection; int opt = 1, ret = -1, connection;
process_lock();
connection = accept(fd, NULL, 0); connection = accept(fd, NULL, 0);
process_unlock();
if (connection < 0) { if (connection < 0) {
SYSERROR("failed to accept connection"); SYSERROR("failed to accept connection");
return -1; return -1;
...@@ -853,9 +848,7 @@ out: ...@@ -853,9 +848,7 @@ out:
return ret; return ret;
out_close: out_close:
process_lock();
close(connection); close(connection);
process_unlock();
goto out; goto out;
} }
...@@ -884,9 +877,7 @@ int lxc_cmd_init(const char *name, struct lxc_handler *handler, ...@@ -884,9 +877,7 @@ int lxc_cmd_init(const char *name, struct lxc_handler *handler,
if (fcntl(fd, F_SETFD, FD_CLOEXEC)) { if (fcntl(fd, F_SETFD, FD_CLOEXEC)) {
SYSERROR("failed to set sigfd to close-on-exec"); SYSERROR("failed to set sigfd to close-on-exec");
process_lock();
close(fd); close(fd);
process_unlock();
return -1; return -1;
} }
...@@ -903,9 +894,7 @@ int lxc_cmd_mainloop_add(const char *name, ...@@ -903,9 +894,7 @@ int lxc_cmd_mainloop_add(const char *name,
ret = lxc_mainloop_add_handler(descr, fd, lxc_cmd_accept, handler); ret = lxc_mainloop_add_handler(descr, fd, lxc_cmd_accept, handler);
if (ret) { if (ret) {
ERROR("failed to add handler for command socket"); ERROR("failed to add handler for command socket");
process_lock();
close(fd); close(fd);
process_unlock();
} }
return ret; return ret;
......
src/lxc/conf.c
...@@ -284,9 +284,7 @@ static int run_buffer(char *buffer) ...@@ -284,9 +284,7 @@ static int run_buffer(char *buffer)
char *output; char *output;
int ret; int ret;
process_lock();
f = lxc_popen(buffer); f = lxc_popen(buffer);
process_unlock();
if (!f) { if (!f) {
SYSERROR("popen failed"); SYSERROR("popen failed");
return -1; return -1;
...@@ -295,9 +293,7 @@ static int run_buffer(char *buffer) ...@@ -295,9 +293,7 @@ static int run_buffer(char *buffer)
output = malloc(LXC_LOG_BUFFER_SIZE); output = malloc(LXC_LOG_BUFFER_SIZE);
if (!output) { if (!output) {
ERROR("failed to allocate memory for script output"); ERROR("failed to allocate memory for script output");
process_lock();
lxc_pclose(f); lxc_pclose(f);
process_unlock();
return -1; return -1;
} }
...@@ -306,9 +302,7 @@ static int run_buffer(char *buffer) ...@@ -306,9 +302,7 @@ static int run_buffer(char *buffer)
free(output); free(output);
process_lock();
ret = lxc_pclose(f); ret = lxc_pclose(f);
process_unlock();
if (ret == -1) { if (ret == -1) {
SYSERROR("Script exited on error"); SYSERROR("Script exited on error");
return -1; return -1;
...@@ -513,9 +507,7 @@ static int setup_lodev(const char *rootfs, int fd, struct loop_info64 *loinfo) ...@@ -513,9 +507,7 @@ static int setup_lodev(const char *rootfs, int fd, struct loop_info64 *loinfo)
int rfd; int rfd;
int ret = -1; int ret = -1;
process_lock();
rfd = open(rootfs, O_RDWR); rfd = open(rootfs, O_RDWR);
process_unlock();
if (rfd < 0) { if (rfd < 0) {
SYSERROR("failed to open '%s'", rootfs); SYSERROR("failed to open '%s'", rootfs);
return -1; return -1;
...@@ -537,9 +529,7 @@ static int setup_lodev(const char *rootfs, int fd, struct loop_info64 *loinfo) ...@@ -537,9 +529,7 @@ static int setup_lodev(const char *rootfs, int fd, struct loop_info64 *loinfo)
ret = 0; ret = 0;
out: out:
process_lock();
close(rfd); close(rfd);
process_unlock();
return ret; return ret;
} }
...@@ -552,9 +542,7 @@ static int mount_rootfs_file(const char *rootfs, const char *target) ...@@ -552,9 +542,7 @@ static int mount_rootfs_file(const char *rootfs, const char *target)
DIR *dir; DIR *dir;
char path[MAXPATHLEN]; char path[MAXPATHLEN];
process_lock();
dir = opendir("/dev"); dir = opendir("/dev");
process_unlock();
if (!dir) { if (!dir) {
SYSERROR("failed to open '/dev'"); SYSERROR("failed to open '/dev'");
return -1; return -1;
...@@ -578,25 +566,19 @@ static int mount_rootfs_file(const char *rootfs, const char *target) ...@@ -578,25 +566,19 @@ static int mount_rootfs_file(const char *rootfs, const char *target)
if (rc < 0 || rc >= MAXPATHLEN) if (rc < 0 || rc >= MAXPATHLEN)
continue; continue;
process_lock();
fd = open(path, O_RDWR); fd = open(path, O_RDWR);
process_unlock();
if (fd < 0) if (fd < 0)
continue; continue;
if (ioctl(fd, LOOP_GET_STATUS64, &loinfo) == 0) { if (ioctl(fd, LOOP_GET_STATUS64, &loinfo) == 0) {
process_lock();
close(fd); close(fd);
process_unlock();
continue; continue;
} }
if (errno != ENXIO) { if (errno != ENXIO) {
WARN("unexpected error for ioctl on '%s': %m", WARN("unexpected error for ioctl on '%s': %m",
direntp->d_name); direntp->d_name);
process_lock();
close(fd); close(fd);
process_unlock();
continue; continue;
} }
...@@ -605,17 +587,13 @@ static int mount_rootfs_file(const char *rootfs, const char *target) ...@@ -605,17 +587,13 @@ static int mount_rootfs_file(const char *rootfs, const char *target)
ret = setup_lodev(rootfs, fd, &loinfo); ret = setup_lodev(rootfs, fd, &loinfo);
if (!ret) if (!ret)
ret = mount_unknow_fs(path, target, 0); ret = mount_unknow_fs(path, target, 0);
process_lock();
close(fd); close(fd);
process_unlock();
break; break;
} }
process_lock();
if (closedir(dir)) if (closedir(dir))
WARN("failed to close directory"); WARN("failed to close directory");
process_unlock();
return ret; return ret;
} }
...@@ -661,9 +639,7 @@ int pin_rootfs(const char *rootfs) ...@@ -661,9 +639,7 @@ int pin_rootfs(const char *rootfs)
if (ret >= MAXPATHLEN) if (ret >= MAXPATHLEN)
return -1; return -1;
process_lock();
fd = open(absrootfspin, O_CREAT | O_RDWR, S_IWUSR|S_IRUSR); fd = open(absrootfspin, O_CREAT | O_RDWR, S_IWUSR|S_IRUSR);
process_unlock();
if (fd < 0) if (fd < 0)
return fd; return fd;
(void)unlink(absrootfspin); (void)unlink(absrootfspin);
...@@ -840,17 +816,13 @@ static int setup_tty(const struct lxc_rootfs *rootfs, ...@@ -840,17 +816,13 @@ static int setup_tty(const struct lxc_rootfs *rootfs,
ERROR("pathname too long for ttys"); ERROR("pathname too long for ttys");
return -1; return -1;
} }
process_lock();
ret = creat(lxcpath, 0660); ret = creat(lxcpath, 0660);
process_unlock();
if (ret==-1 && errno != EEXIST) { if (ret==-1 && errno != EEXIST) {
SYSERROR("error creating %s\n", lxcpath); SYSERROR("error creating %s\n", lxcpath);
return -1; return -1;
} }
process_lock();
if (ret >= 0) if (ret >= 0)
close(ret); close(ret);
process_unlock();
ret = unlink(path); ret = unlink(path);
if (ret && errno != ENOENT) { if (ret && errno != ENOENT) {
SYSERROR("error unlinking %s\n", path); SYSERROR("error unlinking %s\n", path);
...@@ -876,16 +848,12 @@ static int setup_tty(const struct lxc_rootfs *rootfs, ...@@ -876,16 +848,12 @@ static int setup_tty(const struct lxc_rootfs *rootfs,
} else { } else {
/* If we populated /dev, then we need to create /dev/ttyN */ /* If we populated /dev, then we need to create /dev/ttyN */
if (access(path, F_OK)) { if (access(path, F_OK)) {
process_lock();
ret = creat(path, 0660); ret = creat(path, 0660);
process_unlock();
if (ret==-1) { if (ret==-1) {
SYSERROR("error creating %s\n", path); SYSERROR("error creating %s\n", path);
/* this isn't fatal, continue */ /* this isn't fatal, continue */
} else { } else {
process_lock();
close(ret); close(ret);
process_unlock();
} }
} }
if (mount(pty_info->name, path, "none", MS_BIND, 0)) { if (mount(pty_info->name, path, "none", MS_BIND, 0)) {
...@@ -1157,9 +1125,7 @@ int mount_check_fs( const char *dir, char *fstype ) ...@@ -1157,9 +1125,7 @@ int mount_check_fs( const char *dir, char *fstype )
return 0; return 0;
} }
process_lock();
f = fopen("/proc/self/mounts", "r"); f = fopen("/proc/self/mounts", "r");
process_unlock();
if (!f) if (!f)
return 0; return 0;
while ((p = fgets(buf, LINELEN, f))) { while ((p = fgets(buf, LINELEN, f))) {
...@@ -1193,9 +1159,7 @@ int mount_check_fs( const char *dir, char *fstype ) ...@@ -1193,9 +1159,7 @@ int mount_check_fs( const char *dir, char *fstype )
} }
} }
process_lock();
fclose(f); fclose(f);
process_unlock();
DEBUG("mount_check_fs returning %d last %s\n", found_fs, fstype); DEBUG("mount_check_fs returning %d last %s\n", found_fs, fstype);
...@@ -1455,9 +1419,7 @@ int detect_shared_rootfs(void) ...@@ -1455,9 +1419,7 @@ int detect_shared_rootfs(void)
int i; int i;
char *p2; char *p2;
process_lock();
f = fopen("/proc/self/mountinfo", "r"); f = fopen("/proc/self/mountinfo", "r");
process_unlock();
if (!f) if (!f)
return 0; return 0;
while ((p = fgets(buf, LINELEN, f))) { while ((p = fgets(buf, LINELEN, f))) {
...@@ -1473,16 +1435,12 @@ int detect_shared_rootfs(void) ...@@ -1473,16 +1435,12 @@ int detect_shared_rootfs(void)
// this is '/'. is it shared? // this is '/'. is it shared?
p = index(p2+1, ' '); p = index(p2+1, ' ');
if (p && strstr(p, "shared:")) { if (p && strstr(p, "shared:")) {
process_lock();
fclose(f); fclose(f);
process_unlock();
return 1; return 1;
} }
} }
} }
process_lock();
fclose(f); fclose(f);
process_unlock();
return 0; return 0;
} }
...@@ -1738,17 +1696,13 @@ static int setup_ttydir_console(const struct lxc_rootfs *rootfs, ...@@ -1738,17 +1696,13 @@ static int setup_ttydir_console(const struct lxc_rootfs *rootfs,
return -1; return -1;
} }
process_lock();
ret = creat(lxcpath, 0660); ret = creat(lxcpath, 0660);
process_unlock();
if (ret==-1 && errno != EEXIST) { if (ret==-1 && errno != EEXIST) {
SYSERROR("error %d creating %s\n", errno, lxcpath); SYSERROR("error %d creating %s\n", errno, lxcpath);
return -1; return -1;
} }
process_lock();
if (ret >= 0) if (ret >= 0)
close(ret); close(ret);
process_unlock();
if (console->master < 0) { if (console->master < 0) {
INFO("no console"); INFO("no console");
...@@ -2132,9 +2086,7 @@ static int setup_mount(const struct lxc_rootfs *rootfs, const char *fstab, ...@@ -2132,9 +2086,7 @@ static int setup_mount(const struct lxc_rootfs *rootfs, const char *fstab,
if (!fstab) if (!fstab)
return 0; return 0;
process_lock();
file = setmntent(fstab, "r"); file = setmntent(fstab, "r");
process_unlock();
if (!file) { if (!file) {
SYSERROR("failed to use '%s'", fstab); SYSERROR("failed to use '%s'", fstab);
return -1; return -1;
...@@ -2142,9 +2094,7 @@ static int setup_mount(const struct lxc_rootfs *rootfs, const char *fstab, ...@@ -2142,9 +2094,7 @@ static int setup_mount(const struct lxc_rootfs *rootfs, const char *fstab,
ret = mount_file_entries(rootfs, file, lxc_name); ret = mount_file_entries(rootfs, file, lxc_name);
process_lock();
endmntent(file); endmntent(file);
process_unlock();
return ret; return ret;
} }
...@@ -2156,9 +2106,7 @@ static int setup_mount_entries(const struct lxc_rootfs *rootfs, struct lxc_list ...@@ -2156,9 +2106,7 @@ static int setup_mount_entries(const struct lxc_rootfs *rootfs, struct lxc_list
char *mount_entry; char *mount_entry;
int ret; int ret;
process_lock();
file = tmpfile(); file = tmpfile();
process_unlock();
if (!file) { if (!file) {
ERROR("tmpfile error: %m"); ERROR("tmpfile error: %m");
return -1; return -1;
...@@ -2173,9 +2121,7 @@ static int setup_mount_entries(const struct lxc_rootfs *rootfs, struct lxc_list ...@@ -2173,9 +2121,7 @@ static int setup_mount_entries(const struct lxc_rootfs *rootfs, struct lxc_list
ret = mount_file_entries(rootfs, file, lxc_name); ret = mount_file_entries(rootfs, file, lxc_name);
process_lock();
fclose(file); fclose(file);
process_unlock();
return ret; return ret;
} }
...@@ -2321,18 +2267,14 @@ static int setup_hw_addr(char *hwaddr, const char *ifname) ...@@ -2321,18 +2267,14 @@ static int setup_hw_addr(char *hwaddr, const char *ifname)
ifr.ifr_name[IFNAMSIZ-1] = '\0'; ifr.ifr_name[IFNAMSIZ-1] = '\0';
memcpy((char *) &ifr.ifr_hwaddr, (char *) &sockaddr, sizeof(sockaddr)); memcpy((char *) &ifr.ifr_hwaddr, (char *) &sockaddr, sizeof(sockaddr));
process_lock();
fd = socket(AF_INET, SOCK_DGRAM, 0); fd = socket(AF_INET, SOCK_DGRAM, 0);
process_unlock();
if (fd < 0) { if (fd < 0) {
ERROR("socket failure : %s", strerror(errno)); ERROR("socket failure : %s", strerror(errno));
return -1; return -1;
} }
ret = ioctl(fd, SIOCSIFHWADDR, &ifr); ret = ioctl(fd, SIOCSIFHWADDR, &ifr);
process_lock();
close(fd); close(fd);
process_unlock();
if (ret) if (ret)
ERROR("ioctl failure : %s", strerror(errno)); ERROR("ioctl failure : %s", strerror(errno));
...@@ -3112,9 +3054,7 @@ static int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf, ...@@ -3112,9 +3054,7 @@ static int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf,
fprintf(stderr, "%s: path name too long", __func__); fprintf(stderr, "%s: path name too long", __func__);
return -E2BIG; return -E2BIG;
} }
process_lock();
f = fopen(path, "w"); f = fopen(path, "w");
process_unlock();
if (!f) { if (!f) {
perror("open"); perror("open");
return -EINVAL; return -EINVAL;
...@@ -3122,9 +3062,7 @@ static int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf, ...@@ -3122,9 +3062,7 @@ static int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf,
ret = fwrite(buf, buf_size, 1, f); ret = fwrite(buf, buf_size, 1, f);
if (ret < 0) if (ret < 0)
SYSERROR("writing id mapping"); SYSERROR("writing id mapping");
process_lock();
closeret = fclose(f); closeret = fclose(f);
process_unlock();
if (closeret) if (closeret)
SYSERROR("writing id mapping"); SYSERROR("writing id mapping");
return ret < 0 ? ret : closeret; return ret < 0 ? ret : closeret;
...@@ -3344,10 +3282,8 @@ void lxc_delete_tty(struct lxc_tty_info *tty_info) ...@@ -3344,10 +3282,8 @@ void lxc_delete_tty(struct lxc_tty_info *tty_info)
for (i = 0; i < tty_info->nbtty; i++) { for (i = 0; i < tty_info->nbtty; i++) {
struct lxc_pty_info *pty_info = &tty_info->pty_info[i]; struct lxc_pty_info *pty_info = &tty_info->pty_info[i];
process_lock();
close(pty_info->master); close(pty_info->master);
close(pty_info->slave); close(pty_info->slave);
process_unlock();
} }
free(tty_info->pty_info); free(tty_info->pty_info);
...@@ -4084,9 +4020,7 @@ int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data) ...@@ -4084,9 +4020,7 @@ int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data)
int p[2]; int p[2];
struct lxc_list *idmap; struct lxc_list *idmap;
process_lock();
ret = pipe(p); ret = pipe(p);
process_unlock();
if (ret < 0) { if (ret < 0) {
SYSERROR("opening pipe"); SYSERROR("opening pipe");
return -1; return -1;
...@@ -4098,9 +4032,7 @@ int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data) ...@@ -4098,9 +4032,7 @@ int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data)
pid = lxc_clone(run_userns_fn, &d, CLONE_NEWUSER); pid = lxc_clone(run_userns_fn, &d, CLONE_NEWUSER);
if (pid < 0) if (pid < 0)
goto err; goto err;
process_lock();
close(p[0]); close(p[0]);
process_unlock();
p[0] = -1; p[0] = -1;
if ((idmap = idmap_add_id(conf, geteuid())) == NULL) { if ((idmap = idmap_add_id(conf, geteuid())) == NULL) {
...@@ -4127,10 +4059,8 @@ int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data) ...@@ -4127,10 +4059,8 @@ int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data)
goto err; goto err;
} }
err: err:
process_lock();
if (p[0] != -1) if (p[0] != -1)
close(p[0]); close(p[0]);
close(p[1]); close(p[1]);
process_unlock();
return -1; return -1;
} }
src/lxc/console.c
...@@ -202,9 +202,7 @@ out: ...@@ -202,9 +202,7 @@ out:
static void lxc_console_sigwinch_fini(struct lxc_tty_state *ts) static void lxc_console_sigwinch_fini(struct lxc_tty_state *ts)
{ {
if (ts->sigfd >= 0) { if (ts->sigfd >= 0) {
process_lock();
close(ts->sigfd); close(ts->sigfd);
process_unlock();
} }
lxc_list_del(&ts->node); lxc_list_del(&ts->node);
sigprocmask(SIG_SETMASK, &ts->oldmask, NULL); sigprocmask(SIG_SETMASK, &ts->oldmask, NULL);
...@@ -227,9 +225,7 @@ static int lxc_console_cb_con(int fd, uint32_t events, void *data, ...@@ -227,9 +225,7 @@ static int lxc_console_cb_con(int fd, uint32_t events, void *data,
if (!r) { if (!r) {
INFO("console client on fd %d has exited", fd); INFO("console client on fd %d has exited", fd);
lxc_mainloop_del_handler(descr, fd); lxc_mainloop_del_handler(descr, fd);
process_lock();
close(fd); close(fd);
process_unlock();
return 0; return 0;
} }
...@@ -345,10 +341,8 @@ static void lxc_console_peer_proxy_free(struct lxc_console *console) ...@@ -345,10 +341,8 @@ static void lxc_console_peer_proxy_free(struct lxc_console *console)
lxc_console_sigwinch_fini(console->tty_state); lxc_console_sigwinch_fini(console->tty_state);
console->tty_state = NULL; console->tty_state = NULL;
} }
process_lock();
close(console->peerpty.master); close(console->peerpty.master);
close(console->peerpty.slave); close(console->peerpty.slave);
process_unlock();
console->peerpty.master = -1; console->peerpty.master = -1;
console->peerpty.slave = -1; console->peerpty.slave = -1;
console->peerpty.busy = -1; console->peerpty.busy = -1;
...@@ -492,23 +486,19 @@ static void lxc_console_peer_default(struct lxc_console *console) ...@@ -492,23 +486,19 @@ static void lxc_console_peer_default(struct lxc_console *console)
*/ */
if (!path && !access("/dev/tty", F_OK)) { if (!path && !access("/dev/tty", F_OK)) {
int fd; int fd;
process_lock();
fd = open("/dev/tty", O_RDWR); fd = open("/dev/tty", O_RDWR);
if (fd >= 0) { if (fd >= 0) {
close(fd); close(fd);
path = "/dev/tty"; path = "/dev/tty";
} }
process_unlock();
} }
if (!path) if (!path)
goto out; goto out;
DEBUG("opening %s for console peer", path); DEBUG("opening %s for console peer", path);
process_lock();
console->peer = lxc_unpriv(open(path, O_CLOEXEC | O_RDWR | O_CREAT | console->peer = lxc_unpriv(open(path, O_CLOEXEC | O_RDWR | O_CREAT |
O_APPEND, 0600)); O_APPEND, 0600));
process_unlock();
if (console->peer < 0) if (console->peer < 0)
goto out; goto out;
...@@ -539,9 +529,7 @@ err2: ...@@ -539,9 +529,7 @@ err2:
free(console->tios); free(console->tios);
console->tios = NULL; console->tios = NULL;
err1: err1:
process_lock();
close(console->peer); close(console->peer);
process_unlock();
console->peer = -1; console->peer = -1;
out: out:
DEBUG("no console peer"); DEBUG("no console peer");
...@@ -555,13 +543,11 @@ void lxc_console_delete(struct lxc_console *console) ...@@ -555,13 +543,11 @@ void lxc_console_delete(struct lxc_console *console)
free(console->tios); free(console->tios);
console->tios = NULL; console->tios = NULL;
process_lock();
close(console->peer); close(console->peer);
close(console->master); close(console->master);
close(console->slave); close(console->slave);
if (console->log_fd >= 0) if (console->log_fd >= 0)
close(console->log_fd); close(console->log_fd);
process_unlock();
console->peer = -1; console->peer = -1;
console->master = -1; console->master = -1;
...@@ -607,11 +593,9 @@ int lxc_console_create(struct lxc_conf *conf) ...@@ -607,11 +593,9 @@ int lxc_console_create(struct lxc_conf *conf)
lxc_console_peer_default(console); lxc_console_peer_default(console);
if (console->log_path) { if (console->log_path) {
process_lock();
console->log_fd = lxc_unpriv(open(console->log_path, console->log_fd = lxc_unpriv(open(console->log_path,
O_CLOEXEC | O_RDWR | O_CLOEXEC | O_RDWR |
O_CREAT | O_APPEND, 0600)); O_CREAT | O_APPEND, 0600));
process_unlock();
if (console->log_fd < 0) { if (console->log_fd < 0) {
SYSERROR("failed to open '%s'", console->log_path); SYSERROR("failed to open '%s'", console->log_path);
goto err; goto err;
...@@ -774,10 +758,8 @@ err4: ...@@ -774,10 +758,8 @@ err4:
err3: err3:
lxc_console_sigwinch_fini(ts); lxc_console_sigwinch_fini(ts);
err2: err2:
process_lock();
close(masterfd); close(masterfd);
close(ttyfd); close(ttyfd);
process_unlock();
err1: err1:
tcsetattr(stdinfd, TCSAFLUSH, &oldtios); tcsetattr(stdinfd, TCSAFLUSH, &oldtios);
......
src/lxc/freezer.c
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include "error.h" #include "error.h"
#include "state.h" #include "state.h"
#include "monitor.h" #include "monitor.h"
#include "lxclock.h"
#include <lxc/log.h> #include <lxc/log.h>
#include <lxc/cgroup.h> #include <lxc/cgroup.h>
...@@ -53,9 +52,7 @@ static int do_unfreeze(const char *nsgroup, int freeze, const char *name, const ...@@ -53,9 +52,7 @@ static int do_unfreeze(const char *nsgroup, int freeze, const char *name, const
return -1; return -1;
} }
process_lock();
fd = open(freezer, O_RDWR); fd = open(freezer, O_RDWR);
process_unlock();
if (fd < 0) { if (fd < 0) {
SYSERROR("failed to open freezer at '%s'", nsgroup); SYSERROR("failed to open freezer at '%s'", nsgroup);
return -1; return -1;
...@@ -117,9 +114,7 @@ static int do_unfreeze(const char *nsgroup, int freeze, const char *name, const ...@@ -117,9 +114,7 @@ static int do_unfreeze(const char *nsgroup, int freeze, const char *name, const
} }
out: out:
process_lock();
close(fd); close(fd);
process_unlock();
return ret; return ret;
} }
......
src/lxc/log.c
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include "log.h" #include "log.h"
#include "caps.h" #include "caps.h"
#include "utils.h" #include "utils.h"
#include "lxclock.h"
#define LXC_LOG_PREFIX_SIZE 32 #define LXC_LOG_PREFIX_SIZE 32
#define LXC_LOG_BUFFER_SIZE 512 #define LXC_LOG_BUFFER_SIZE 512
...@@ -162,10 +161,8 @@ static int log_open(const char *name) ...@@ -162,10 +161,8 @@ static int log_open(const char *name)
int fd; int fd;
int newfd; int newfd;
process_lock();
fd = lxc_unpriv(open(name, O_CREAT | O_WRONLY | fd = lxc_unpriv(open(name, O_CREAT | O_WRONLY |
O_APPEND | O_CLOEXEC, 0666)); O_APPEND | O_CLOEXEC, 0666));
process_unlock();
if (fd == -1) { if (fd == -1) {
ERROR("failed to open log file \"%s\" : %s", name, ERROR("failed to open log file \"%s\" : %s", name,
strerror(errno)); strerror(errno));
...@@ -179,9 +176,7 @@ static int log_open(const char *name) ...@@ -179,9 +176,7 @@ static int log_open(const char *name)
if (newfd == -1) if (newfd == -1)
ERROR("failed to dup log fd %d : %s", fd, strerror(errno)); ERROR("failed to dup log fd %d : %s", fd, strerror(errno));
process_lock();
close(fd); close(fd);
process_unlock();
return newfd; return newfd;
} }
...@@ -248,9 +243,7 @@ static int __lxc_log_set_file(const char *fname, int create_dirs) ...@@ -248,9 +243,7 @@ static int __lxc_log_set_file(const char *fname, int create_dirs)
{ {
if (lxc_log_fd != -1) { if (lxc_log_fd != -1) {
// we are overriding the default. // we are overriding the default.
process_lock();
close(lxc_log_fd); close(lxc_log_fd);
process_unlock();
free(log_fname); free(log_fname);
} }
......
src/lxc/lsm/apparmor.c
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/apparmor.h> #include <sys/apparmor.h>
#include "log.h" #include "log.h"
#include "lxclock.h"
#include "lsm/lsm.h" #include "lsm/lsm.h"
lxc_log_define(lxc_apparmor, lxc); lxc_log_define(lxc_apparmor, lxc);
...@@ -50,15 +49,11 @@ static int apparmor_enabled(void) ...@@ -50,15 +49,11 @@ static int apparmor_enabled(void)
ret = stat(AA_MOUNT_RESTR, &statbuf); ret = stat(AA_MOUNT_RESTR, &statbuf);
if (ret != 0) if (ret != 0)
return 0; return 0;
process_lock();
fin = fopen(AA_ENABLED_FILE, "r"); fin = fopen(AA_ENABLED_FILE, "r");
process_unlock();
if (!fin) if (!fin)
return 0; return 0;
ret = fscanf(fin, "%c", &e); ret = fscanf(fin, "%c", &e);
process_lock();
fclose(fin); fclose(fin);
process_unlock();
if (ret == 1 && e == 'Y') if (ret == 1 && e == 'Y')
return 1; return 1;
return 0; return 0;
...@@ -78,9 +73,7 @@ static char *apparmor_process_label_get(pid_t pid) ...@@ -78,9 +73,7 @@ static char *apparmor_process_label_get(pid_t pid)
return NULL; return NULL;
} }
again: again:
process_lock();
f = fopen(path, "r"); f = fopen(path, "r");
process_unlock();
if (!f) { if (!f) {
SYSERROR("opening %s\n", path); SYSERROR("opening %s\n", path);
if (buf) if (buf)
...@@ -92,17 +85,13 @@ again: ...@@ -92,17 +85,13 @@ again:
if (!newbuf) { if (!newbuf) {
free(buf); free(buf);
ERROR("out of memory"); ERROR("out of memory");
process_lock();
fclose(f); fclose(f);
process_unlock();
return NULL; return NULL;
} }
buf = newbuf; buf = newbuf;
memset(buf, 0, sz); memset(buf, 0, sz);
ret = fread(buf, 1, sz - 1, f); ret = fread(buf, 1, sz - 1, f);
process_lock();
fclose(f); fclose(f);
process_unlock();
if (ret < 0) { if (ret < 0) {
ERROR("reading %s\n", path); ERROR("reading %s\n", path);
free(buf); free(buf);
......
src/lxc/lxclock.c
...@@ -119,9 +119,7 @@ static char *lxclock_name(const char *p, const char *n) ...@@ -119,9 +119,7 @@ static char *lxclock_name(const char *p, const char *n)
free(dest); free(dest);
return NULL; return NULL;
} }
process_lock();
ret = mkdir_p(dest, 0755); ret = mkdir_p(dest, 0755);
process_unlock();
if (ret < 0) { if (ret < 0) {
free(dest); free(dest);
return NULL; return NULL;
...@@ -217,12 +215,10 @@ int lxclock(struct lxc_lock *l, int timeout) ...@@ -217,12 +215,10 @@ int lxclock(struct lxc_lock *l, int timeout)
ret = -2; ret = -2;
goto out; goto out;
} }
process_lock();
if (l->u.f.fd == -1) { if (l->u.f.fd == -1) {
l->u.f.fd = open(l->u.f.fname, O_RDWR|O_CREAT, l->u.f.fd = open(l->u.f.fname, O_RDWR|O_CREAT,
S_IWUSR | S_IRUSR); S_IWUSR | S_IRUSR);
if (l->u.f.fd == -1) { if (l->u.f.fd == -1) {
process_unlock();
ERROR("Error opening %s", l->u.f.fname); ERROR("Error opening %s", l->u.f.fname);
goto out; goto out;
} }
...@@ -232,7 +228,6 @@ int lxclock(struct lxc_lock *l, int timeout) ...@@ -232,7 +228,6 @@ int lxclock(struct lxc_lock *l, int timeout)
lk.l_start = 0; lk.l_start = 0;
lk.l_len = 0; lk.l_len = 0;
ret = fcntl(l->u.f.fd, F_SETLKW, &lk); ret = fcntl(l->u.f.fd, F_SETLKW, &lk);
process_unlock();
if (ret == -1) if (ret == -1)
saved_errno = errno; saved_errno = errno;
break; break;
...@@ -258,7 +253,6 @@ int lxcunlock(struct lxc_lock *l) ...@@ -258,7 +253,6 @@ int lxcunlock(struct lxc_lock *l)
} }
break; break;
case LXC_LOCK_FLOCK: case LXC_LOCK_FLOCK:
process_lock();
if (l->u.f.fd != -1) { if (l->u.f.fd != -1) {
lk.l_type = F_UNLCK; lk.l_type = F_UNLCK;
lk.l_whence = SEEK_SET; lk.l_whence = SEEK_SET;
...@@ -271,7 +265,6 @@ int lxcunlock(struct lxc_lock *l) ...@@ -271,7 +265,6 @@ int lxcunlock(struct lxc_lock *l)
l->u.f.fd = -1; l->u.f.fd = -1;
} else } else
ret = -2; ret = -2;
process_unlock();
break; break;
} }
...@@ -299,12 +292,10 @@ void lxc_putlock(struct lxc_lock *l) ...@@ -299,12 +292,10 @@ void lxc_putlock(struct lxc_lock *l)
} }
break; break;
case LXC_LOCK_FLOCK: case LXC_LOCK_FLOCK:
process_lock();
if (l->u.f.fd != -1) { if (l->u.f.fd != -1) {
close(l->u.f.fd); close(l->u.f.fd);
l->u.f.fd = -1; l->u.f.fd = -1;
} }
process_unlock();
if (l->u.f.fname) { if (l->u.f.fname) {
free(l->u.f.fname); free(l->u.f.fname);
l->u.f.fname = NULL; l->u.f.fname = NULL;
......
src/lxc/lxcutmp.c
...@@ -62,7 +62,6 @@ static int timerfd_settime (int __ufd, int __flags, ...@@ -62,7 +62,6 @@ static int timerfd_settime (int __ufd, int __flags,
#include "mainloop.h" #include "mainloop.h"
#include "lxc.h" #include "lxc.h"
#include "log.h" #include "log.h"
#include "lxclock.h"
#ifndef __USE_GNU #ifndef __USE_GNU
#define __USE_GNU #define __USE_GNU
...@@ -344,9 +343,7 @@ run_ok: ...@@ -344,9 +343,7 @@ run_ok:
memset(utmp_data, 0, sizeof(struct lxc_utmp)); memset(utmp_data, 0, sizeof(struct lxc_utmp));
process_lock();
fd = inotify_init(); fd = inotify_init();
process_unlock();
if (fd < 0) { if (fd < 0) {
SYSERROR("failed to inotify_init"); SYSERROR("failed to inotify_init");
goto out; goto out;
...@@ -380,9 +377,7 @@ run_ok: ...@@ -380,9 +377,7 @@ run_ok:
return 0; return 0;
out_close: out_close:
process_lock();
close(fd); close(fd);
process_unlock();
out: out:
free(utmp_data); free(utmp_data);
return -1; return -1;
...@@ -432,9 +427,7 @@ int lxc_utmp_add_timer(struct lxc_epoll_descr *descr, ...@@ -432,9 +427,7 @@ int lxc_utmp_add_timer(struct lxc_epoll_descr *descr,
struct itimerspec timeout; struct itimerspec timeout;
struct lxc_utmp *utmp_data = (struct lxc_utmp *)data; struct lxc_utmp *utmp_data = (struct lxc_utmp *)data;
process_lock();
fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK | TFD_CLOEXEC); fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK | TFD_CLOEXEC);
process_unlock();
if (fd < 0) { if (fd < 0) {
SYSERROR("failed to create timer"); SYSERROR("failed to create timer");
return -1; return -1;
...@@ -458,9 +451,7 @@ int lxc_utmp_add_timer(struct lxc_epoll_descr *descr, ...@@ -458,9 +451,7 @@ int lxc_utmp_add_timer(struct lxc_epoll_descr *descr,
if (lxc_mainloop_add_handler(descr, fd, callback, utmp_data)) { if (lxc_mainloop_add_handler(descr, fd, callback, utmp_data)) {
SYSERROR("failed to add utmp timer to mainloop"); SYSERROR("failed to add utmp timer to mainloop");
process_lock();
close(fd); close(fd);
process_unlock();
return -1; return -1;
} }
...@@ -481,9 +472,7 @@ int lxc_utmp_del_timer(struct lxc_epoll_descr *descr, ...@@ -481,9 +472,7 @@ int lxc_utmp_del_timer(struct lxc_epoll_descr *descr,
SYSERROR("failed to del utmp timer from mainloop"); SYSERROR("failed to del utmp timer from mainloop");
/* shutdown timer_fd */ /* shutdown timer_fd */
process_lock();
close(utmp_data->timer_fd); close(utmp_data->timer_fd);
process_unlock();
utmp_data->timer_fd = -1; utmp_data->timer_fd = -1;
if (result < 0) if (result < 0)
......
src/lxc/mainloop.c
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <sys/epoll.h> #include <sys/epoll.h>
#include "mainloop.h" #include "mainloop.h"
#include "lxclock.h"
struct mainloop_handler { struct mainloop_handler {
lxc_mainloop_callback_t callback; lxc_mainloop_callback_t callback;
...@@ -133,16 +132,12 @@ int lxc_mainloop_del_handler(struct lxc_epoll_descr *descr, int fd) ...@@ -133,16 +132,12 @@ int lxc_mainloop_del_handler(struct lxc_epoll_descr *descr, int fd)
int lxc_mainloop_open(struct lxc_epoll_descr *descr) int lxc_mainloop_open(struct lxc_epoll_descr *descr)
{ {
/* hint value passed to epoll create */ /* hint value passed to epoll create */
process_lock();
descr->epfd = epoll_create(2); descr->epfd = epoll_create(2);
process_unlock();
if (descr->epfd < 0) if (descr->epfd < 0)
return -1; return -1;
if (fcntl(descr->epfd, F_SETFD, FD_CLOEXEC)) { if (fcntl(descr->epfd, F_SETFD, FD_CLOEXEC)) {
process_lock();
close(descr->epfd); close(descr->epfd);
process_unlock();
return -1; return -1;
} }
...@@ -153,7 +148,6 @@ int lxc_mainloop_open(struct lxc_epoll_descr *descr) ...@@ -153,7 +148,6 @@ int lxc_mainloop_open(struct lxc_epoll_descr *descr)
int lxc_mainloop_close(struct lxc_epoll_descr *descr) int lxc_mainloop_close(struct lxc_epoll_descr *descr)
{ {
struct lxc_list *iterator, *next; struct lxc_list *iterator, *next;
int ret;
iterator = descr->handlers.next; iterator = descr->handlers.next;
while (iterator != &descr->handlers) { while (iterator != &descr->handlers) {
...@@ -165,9 +159,6 @@ int lxc_mainloop_close(struct lxc_epoll_descr *descr) ...@@ -165,9 +159,6 @@ int lxc_mainloop_close(struct lxc_epoll_descr *descr)
iterator = next; iterator = next;
} }
process_lock(); return close(descr->epfd);
ret = close(descr->epfd);
process_unlock();
return ret;
} }
src/lxc/monitor.c
...@@ -64,9 +64,7 @@ int lxc_monitor_fifo_name(const char *lxcpath, char *fifo_path, size_t fifo_path ...@@ -64,9 +64,7 @@ int lxc_monitor_fifo_name(const char *lxcpath, char *fifo_path, size_t fifo_path
ERROR("rundir/lxcpath (%s/%s) too long for monitor fifo", rundir, lxcpath); ERROR("rundir/lxcpath (%s/%s) too long for monitor fifo", rundir, lxcpath);
return -1; return -1;
} }
process_lock();
ret = mkdir_p(fifo_path, 0755); ret = mkdir_p(fifo_path, 0755);
process_unlock();
if (ret < 0) { if (ret < 0) {
ERROR("unable to create monitor fifo dir %s", fifo_path); ERROR("unable to create monitor fifo dir %s", fifo_path);
return ret; return ret;
...@@ -91,9 +89,7 @@ static void lxc_monitor_fifo_send(struct lxc_msg *msg, const char *lxcpath) ...@@ -91,9 +89,7 @@ static void lxc_monitor_fifo_send(struct lxc_msg *msg, const char *lxcpath)
if (ret < 0) if (ret < 0)
return; return;
process_lock();
fd = open(fifo_path, O_WRONLY); fd = open(fifo_path, O_WRONLY);
process_unlock();
if (fd < 0) { if (fd < 0) {
/* it is normal for this open to fail when there is no monitor /* it is normal for this open to fail when there is no monitor
* running, so we don't log it * running, so we don't log it
...@@ -103,16 +99,12 @@ static void lxc_monitor_fifo_send(struct lxc_msg *msg, const char *lxcpath) ...@@ -103,16 +99,12 @@ static void lxc_monitor_fifo_send(struct lxc_msg *msg, const char *lxcpath)
ret = write(fd, msg, sizeof(*msg)); ret = write(fd, msg, sizeof(*msg));
if (ret != sizeof(*msg)) { if (ret != sizeof(*msg)) {
process_lock();
close(fd); close(fd);
process_unlock();
SYSERROR("failed to write monitor fifo %s", fifo_path); SYSERROR("failed to write monitor fifo %s", fifo_path);
return; return;
} }
process_lock();
close(fd); close(fd);
process_unlock();
} }
void lxc_monitor_send_state(const char *name, lxc_state_t state, const char *lxcpath) void lxc_monitor_send_state(const char *name, lxc_state_t state, const char *lxcpath)
...@@ -129,12 +121,7 @@ void lxc_monitor_send_state(const char *name, lxc_state_t state, const char *lxc ...@@ -129,12 +121,7 @@ void lxc_monitor_send_state(const char *name, lxc_state_t state, const char *lxc
/* routines used by monitor subscribers (lxc-monitor) */ /* routines used by monitor subscribers (lxc-monitor) */
int lxc_monitor_close(int fd) int lxc_monitor_close(int fd)
{ {
int ret; return close(fd);
process_lock();
ret = close(fd);
process_unlock();
return ret;
} }
/* Note we don't use SHA-1 here as we don't want to depend on HAVE_GNUTLS. /* Note we don't use SHA-1 here as we don't want to depend on HAVE_GNUTLS.
...@@ -200,9 +187,7 @@ int lxc_monitor_open(const char *lxcpath) ...@@ -200,9 +187,7 @@ int lxc_monitor_open(const char *lxcpath)
if (lxc_monitor_sock_name(lxcpath, &addr) < 0) if (lxc_monitor_sock_name(lxcpath, &addr) < 0)
return -1; return -1;
process_lock();
fd = socket(PF_UNIX, SOCK_STREAM, 0); fd = socket(PF_UNIX, SOCK_STREAM, 0);
process_unlock();
if (fd < 0) { if (fd < 0) {
ERROR("socket : %s", strerror(errno)); ERROR("socket : %s", strerror(errno));
return -1; return -1;
...@@ -229,9 +214,7 @@ int lxc_monitor_open(const char *lxcpath) ...@@ -229,9 +214,7 @@ int lxc_monitor_open(const char *lxcpath)
} }
return fd; return fd;
err1: err1:
process_lock();
close(fd); close(fd);
process_unlock();
return ret; return ret;
} }
......
src/lxc/network.c
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/socket.h> #include <sys/socket.h>
...@@ -48,7 +49,6 @@ ...@@ -48,7 +49,6 @@
#include "nl.h" #include "nl.h"
#include "network.h" #include "network.h"
#include "conf.h" #include "conf.h"
#include "lxclock.h"
#if HAVE_IFADDRS_H #if HAVE_IFADDRS_H
#include <ifaddrs.h> #include <ifaddrs.h>
...@@ -588,18 +588,14 @@ static int proc_sys_net_write(const char *path, const char *value) ...@@ -588,18 +588,14 @@ static int proc_sys_net_write(const char *path, const char *value)
{ {
int fd, err = 0; int fd, err = 0;
process_lock();
fd = open(path, O_WRONLY); fd = open(path, O_WRONLY);
process_unlock();
if (fd < 0) if (fd < 0)
return -errno; return -errno;
if (write(fd, value, strlen(value)) < 0) if (write(fd, value, strlen(value)) < 0)
err = -errno; err = -errno;
process_lock();
close(fd); close(fd);
process_unlock();
return err; return err;
} }
...@@ -1081,9 +1077,7 @@ int lxc_bridge_attach(const char *bridge, const char *ifname) ...@@ -1081,9 +1077,7 @@ int lxc_bridge_attach(const char *bridge, const char *ifname)
if (!index) if (!index)
return -EINVAL; return -EINVAL;
process_lock();
fd = socket(AF_INET, SOCK_STREAM, 0); fd = socket(AF_INET, SOCK_STREAM, 0);
process_unlock();
if (fd < 0) if (fd < 0)
return -errno; return -errno;
...@@ -1091,9 +1085,7 @@ int lxc_bridge_attach(const char *bridge, const char *ifname) ...@@ -1091,9 +1085,7 @@ int lxc_bridge_attach(const char *bridge, const char *ifname)
ifr.ifr_name[IFNAMSIZ-1] = '\0'; ifr.ifr_name[IFNAMSIZ-1] = '\0';
ifr.ifr_ifindex = index; ifr.ifr_ifindex = index;
err = ioctl(fd, SIOCBRADDIF, &ifr); err = ioctl(fd, SIOCBRADDIF, &ifr);
process_lock();
close(fd); close(fd);
process_unlock();
if (err) if (err)
err = -errno; err = -errno;
...@@ -1131,15 +1123,11 @@ char *lxc_mkifname(char *template) ...@@ -1131,15 +1123,11 @@ char *lxc_mkifname(char *template)
getifaddrs(&ifaddr); getifaddrs(&ifaddr);
/* Initialize the random number generator */ /* Initialize the random number generator */
process_lock();
urandom = fopen ("/dev/urandom", "r"); urandom = fopen ("/dev/urandom", "r");
process_unlock();
if (urandom != NULL) { if (urandom != NULL) {
if (fread (&seed, sizeof(seed), 1, urandom) <= 0) if (fread (&seed, sizeof(seed), 1, urandom) <= 0)
seed = time(0); seed = time(0);
process_lock();
fclose(urandom); fclose(urandom);
process_unlock();
} }
else else
seed = time(0); seed = time(0);
...@@ -1189,26 +1177,20 @@ int setup_private_host_hw_addr(char *veth1) ...@@ -1189,26 +1177,20 @@ int setup_private_host_hw_addr(char *veth1)
int err; int err;
int sockfd; int sockfd;
process_lock();
sockfd = socket(AF_INET, SOCK_DGRAM, 0); sockfd = socket(AF_INET, SOCK_DGRAM, 0);
process_unlock();
if (sockfd < 0) if (sockfd < 0)
return -errno; return -errno;
snprintf((char *)ifr.ifr_name, IFNAMSIZ, "%s", veth1); snprintf((char *)ifr.ifr_name, IFNAMSIZ, "%s", veth1);
err = ioctl(sockfd, SIOCGIFHWADDR, &ifr); err = ioctl(sockfd, SIOCGIFHWADDR, &ifr);
if (err < 0) { if (err < 0) {
process_lock();
close(sockfd); close(sockfd);
process_unlock();
return -errno; return -errno;
} }
ifr.ifr_hwaddr.sa_data[0] = 0xfe; ifr.ifr_hwaddr.sa_data[0] = 0xfe;
err = ioctl(sockfd, SIOCSIFHWADDR, &ifr); err = ioctl(sockfd, SIOCSIFHWADDR, &ifr);
process_lock();
close(sockfd); close(sockfd);
process_unlock();
if (err < 0) if (err < 0)
return -errno; return -errno;
......
src/lxc/nl.c
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include "nl.h" #include "nl.h"
#include "lxclock.h"
#define NLMSG_TAIL(nmsg) \ #define NLMSG_TAIL(nmsg) \
((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len))) ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
...@@ -223,9 +222,7 @@ extern int netlink_open(struct nl_handler *handler, int protocol) ...@@ -223,9 +222,7 @@ extern int netlink_open(struct nl_handler *handler, int protocol)
memset(handler, 0, sizeof(*handler)); memset(handler, 0, sizeof(*handler));
process_lock();
handler->fd = socket(AF_NETLINK, SOCK_RAW, protocol); handler->fd = socket(AF_NETLINK, SOCK_RAW, protocol);
process_unlock();
if (handler->fd < 0) if (handler->fd < 0)
return -errno; return -errno;
...@@ -263,9 +260,7 @@ extern int netlink_open(struct nl_handler *handler, int protocol) ...@@ -263,9 +260,7 @@ extern int netlink_open(struct nl_handler *handler, int protocol)
extern int netlink_close(struct nl_handler *handler) extern int netlink_close(struct nl_handler *handler)
{ {
process_lock();
close(handler->fd); close(handler->fd);
process_unlock();
handler->fd = -1; handler->fd = -1;
return 0; return 0;
} }
......
src/lxc/parse.c
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "parse.h" #include "parse.h"
#include "config.h" #include "config.h"
#include "utils.h" #include "utils.h"
#include "lxclock.h"
#include <lxc/log.h> #include <lxc/log.h>
/* Workaround for the broken signature of alphasort() in bionic. /* Workaround for the broken signature of alphasort() in bionic.
...@@ -91,9 +90,7 @@ int lxc_file_for_each_line(const char *file, lxc_file_cb callback, void *data) ...@@ -91,9 +90,7 @@ int lxc_file_for_each_line(const char *file, lxc_file_cb callback, void *data)
char *line = NULL; char *line = NULL;
size_t len = 0; size_t len = 0;
process_lock();
f = fopen(file, "r"); f = fopen(file, "r");
process_unlock();
if (!f) { if (!f) {
SYSERROR("failed to open %s", file); SYSERROR("failed to open %s", file);
return -1; return -1;
...@@ -112,9 +109,7 @@ int lxc_file_for_each_line(const char *file, lxc_file_cb callback, void *data) ...@@ -112,9 +109,7 @@ int lxc_file_for_each_line(const char *file, lxc_file_cb callback, void *data)
if (line) if (line)
free(line); free(line);
process_lock();
fclose(f); fclose(f);
process_unlock();
return err; return err;
} }
......
src/lxc/seccomp.c
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <seccomp.h> #include <seccomp.h>
#include "config.h" #include "config.h"
#include "lxcseccomp.h" #include "lxcseccomp.h"
#include "lxclock.h"
#include "log.h" #include "log.h"
...@@ -115,17 +114,13 @@ int lxc_read_seccomp_config(struct lxc_conf *conf) ...@@ -115,17 +114,13 @@ int lxc_read_seccomp_config(struct lxc_conf *conf)
return -1; return -1;
} }
process_lock();
f = fopen(conf->seccomp, "r"); f = fopen(conf->seccomp, "r");
process_unlock();
if (!f) { if (!f) {
SYSERROR("failed to open seccomp policy file %s\n", conf->seccomp); SYSERROR("failed to open seccomp policy file %s\n", conf->seccomp);
return -1; return -1;
} }
ret = parse_config(f, conf); ret = parse_config(f, conf);
process_lock();
fclose(f); fclose(f);
process_unlock();
return ret; return ret;
} }
......
src/lxc/start.c
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
#include "namespace.h" #include "namespace.h"
#include "lxcseccomp.h" #include "lxcseccomp.h"
#include "caps.h" #include "caps.h"
#include "lxclock.h"
#include "lsm/lsm.h" #include "lsm/lsm.h"
lxc_log_define(lxc_start, lxc); lxc_log_define(lxc_start, lxc);
...@@ -87,14 +86,12 @@ const struct ns_info ns_info[LXC_NS_MAX] = { ...@@ -87,14 +86,12 @@ const struct ns_info ns_info[LXC_NS_MAX] = {
static void close_ns(int ns_fd[LXC_NS_MAX]) { static void close_ns(int ns_fd[LXC_NS_MAX]) {
int i; int i;
process_lock();
for (i = 0; i < LXC_NS_MAX; i++) { for (i = 0; i < LXC_NS_MAX; i++) {
if (ns_fd[i] > -1) { if (ns_fd[i] > -1) {
close(ns_fd[i]); close(ns_fd[i]);
ns_fd[i] = -1; ns_fd[i] = -1;
} }
} }
process_unlock();
} }
static int preserve_ns(int ns_fd[LXC_NS_MAX], int clone_flags) { static int preserve_ns(int ns_fd[LXC_NS_MAX], int clone_flags) {
...@@ -113,9 +110,7 @@ static int preserve_ns(int ns_fd[LXC_NS_MAX], int clone_flags) { ...@@ -113,9 +110,7 @@ static int preserve_ns(int ns_fd[LXC_NS_MAX], int clone_flags) {
if ((clone_flags & ns_info[i].clone_flag) == 0) if ((clone_flags & ns_info[i].clone_flag) == 0)
continue; continue;
snprintf(path, MAXPATHLEN, "/proc/self/ns/%s", ns_info[i].proc_name); snprintf(path, MAXPATHLEN, "/proc/self/ns/%s", ns_info[i].proc_name);
process_lock();
ns_fd[i] = open(path, O_RDONLY | O_CLOEXEC); ns_fd[i] = open(path, O_RDONLY | O_CLOEXEC);
process_unlock();
if (ns_fd[i] < 0) if (ns_fd[i] < 0)
goto error; goto error;
} }
...@@ -159,9 +154,7 @@ int lxc_check_inherited(struct lxc_conf *conf, int fd_to_ignore) ...@@ -159,9 +154,7 @@ int lxc_check_inherited(struct lxc_conf *conf, int fd_to_ignore)
DIR *dir; DIR *dir;
restart: restart:
process_lock();
dir = opendir("/proc/self/fd"); dir = opendir("/proc/self/fd");
process_unlock();
if (!dir) { if (!dir) {
WARN("failed to open directory: %m"); WARN("failed to open directory: %m");
return -1; return -1;
...@@ -188,19 +181,15 @@ restart: ...@@ -188,19 +181,15 @@ restart:
continue; continue;
if (conf->close_all_fds) { if (conf->close_all_fds) {
process_lock();
close(fd); close(fd);
closedir(dir); closedir(dir);
process_unlock();
INFO("closed inherited fd %d", fd); INFO("closed inherited fd %d", fd);
goto restart; goto restart;
} }
WARN("inherited fd %d", fd); WARN("inherited fd %d", fd);
} }
process_lock();
closedir(dir); /* cannot fail */ closedir(dir); /* cannot fail */
process_unlock();
return 0; return 0;
} }
...@@ -337,9 +326,7 @@ int lxc_poll(const char *name, struct lxc_handler *handler) ...@@ -337,9 +326,7 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
out_mainloop_open: out_mainloop_open:
lxc_mainloop_close(&descr); lxc_mainloop_close(&descr);
out_sigfd: out_sigfd:
process_lock();
close(sigfd); close(sigfd);
process_unlock();
return -1; return -1;
} }
...@@ -440,9 +427,7 @@ out_delete_tty: ...@@ -440,9 +427,7 @@ out_delete_tty:
out_aborting: out_aborting:
lxc_set_state(name, handler, ABORTING); lxc_set_state(name, handler, ABORTING);
out_close_maincmd_fd: out_close_maincmd_fd:
process_lock();
close(conf->maincmd_fd); close(conf->maincmd_fd);
process_unlock();
conf->maincmd_fd = -1; conf->maincmd_fd = -1;
out_free_name: out_free_name:
free(handler->name); free(handler->name);
...@@ -469,9 +454,7 @@ static void lxc_fini(const char *name, struct lxc_handler *handler) ...@@ -469,9 +454,7 @@ static void lxc_fini(const char *name, struct lxc_handler *handler)
lxc_console_delete(&handler->conf->console); lxc_console_delete(&handler->conf->console);
lxc_delete_tty(&handler->conf->tty_info); lxc_delete_tty(&handler->conf->tty_info);
process_lock();
close(handler->conf->maincmd_fd); close(handler->conf->maincmd_fd);
process_unlock();
handler->conf->maincmd_fd = -1; handler->conf->maincmd_fd = -1;
free(handler->name); free(handler->name);
if (handler->cgroup) { if (handler->cgroup) {
...@@ -519,18 +502,14 @@ static int must_drop_cap_sys_boot(struct lxc_conf *conf) ...@@ -519,18 +502,14 @@ static int must_drop_cap_sys_boot(struct lxc_conf *conf)
int status; int status;
pid_t pid; pid_t pid;
process_lock();
f = fopen("/proc/sys/kernel/ctrl-alt-del", "r"); f = fopen("/proc/sys/kernel/ctrl-alt-del", "r");
process_unlock();
if (!f) { if (!f) {
DEBUG("failed to open /proc/sys/kernel/ctrl-alt-del"); DEBUG("failed to open /proc/sys/kernel/ctrl-alt-del");
return 1; return 1;
} }
ret = fscanf(f, "%d", &v); ret = fscanf(f, "%d", &v);
process_lock();
fclose(f); fclose(f);
process_unlock();
if (ret != 1) { if (ret != 1) {
DEBUG("Failed to read /proc/sys/kernel/ctrl-alt-del"); DEBUG("Failed to read /proc/sys/kernel/ctrl-alt-del");
return 1; return 1;
...@@ -587,9 +566,7 @@ static int do_start(void *data) ...@@ -587,9 +566,7 @@ static int do_start(void *data)
/* don't leak the pinfd to the container */ /* don't leak the pinfd to the container */
if (handler->pinfd >= 0) { if (handler->pinfd >= 0) {
process_lock();
close(handler->pinfd); close(handler->pinfd);
process_unlock();
} }
/* Tell the parent task it can begin to configure the /* Tell the parent task it can begin to configure the
...@@ -666,9 +643,7 @@ static int do_start(void *data) ...@@ -666,9 +643,7 @@ static int do_start(void *data)
goto out_warn_father; goto out_warn_father;
} }
process_lock();
close(handler->sigfd); close(handler->sigfd);
process_unlock();
/* after this call, we are in error because this /* after this call, we are in error because this
* ops should not return as it execs */ * ops should not return as it execs */
...@@ -913,9 +888,7 @@ out_abort: ...@@ -913,9 +888,7 @@ out_abort:
lxc_abort(name, handler); lxc_abort(name, handler);
lxc_sync_fini(handler); lxc_sync_fini(handler);
if (handler->pinfd >= 0) { if (handler->pinfd >= 0) {
process_lock();
close(handler->pinfd); close(handler->pinfd);
process_unlock();
handler->pinfd = -1; handler->pinfd = -1;
} }
...@@ -987,9 +960,7 @@ int __lxc_start(const char *name, struct lxc_conf *conf, ...@@ -987,9 +960,7 @@ int __lxc_start(const char *name, struct lxc_conf *conf,
lxc_rename_phys_nics_on_shutdown(handler->conf); lxc_rename_phys_nics_on_shutdown(handler->conf);
if (handler->pinfd >= 0) { if (handler->pinfd >= 0) {
process_lock();
close(handler->pinfd); close(handler->pinfd);
process_unlock();
handler->pinfd = -1; handler->pinfd = -1;
} }
......
src/lxc/state.c
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <lxc/monitor.h> #include <lxc/monitor.h>
#include "commands.h" #include "commands.h"
#include "config.h" #include "config.h"
#include "lxclock.h"
lxc_log_define(lxc_state, lxc); lxc_log_define(lxc_state, lxc);
...@@ -84,18 +83,14 @@ static lxc_state_t freezer_state(const char *name, const char *lxcpath) ...@@ -84,18 +83,14 @@ static lxc_state_t freezer_state(const char *name, const char *lxcpath)
if (ret < 0 || ret >= MAXPATHLEN) if (ret < 0 || ret >= MAXPATHLEN)
goto out; goto out;
process_lock();
file = fopen(freezer, "r"); file = fopen(freezer, "r");
process_unlock();
if (!file) { if (!file) {
ret = -1; ret = -1;
goto out; goto out;
} }
ret = fscanf(file, "%s", status); ret = fscanf(file, "%s", status);
process_lock();
fclose(file); fclose(file);
process_unlock();
if (ret == EOF) { if (ret == EOF) {
SYSERROR("failed to read %s", freezer); SYSERROR("failed to read %s", freezer);
......
src/lxc/sync.c
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "log.h" #include "log.h"
#include "start.h" #include "start.h"
#include "lxclock.h"
lxc_log_define(lxc_sync, lxc); lxc_log_define(lxc_sync, lxc);
...@@ -102,9 +101,7 @@ int lxc_sync_init(struct lxc_handler *handler) ...@@ -102,9 +101,7 @@ int lxc_sync_init(struct lxc_handler *handler)
{ {
int ret; int ret;
process_lock();
ret = socketpair(AF_LOCAL, SOCK_STREAM, 0, handler->sv); ret = socketpair(AF_LOCAL, SOCK_STREAM, 0, handler->sv);
process_unlock();
if (ret) { if (ret) {
SYSERROR("failed to create synchronization socketpair"); SYSERROR("failed to create synchronization socketpair");
return -1; return -1;
...@@ -119,9 +116,7 @@ int lxc_sync_init(struct lxc_handler *handler) ...@@ -119,9 +116,7 @@ int lxc_sync_init(struct lxc_handler *handler)
void lxc_sync_fini_child(struct lxc_handler *handler) void lxc_sync_fini_child(struct lxc_handler *handler)
{ {
if (handler->sv[0] != -1) { if (handler->sv[0] != -1) {
process_lock();
close(handler->sv[0]); close(handler->sv[0]);
process_unlock();
handler->sv[0] = -1; handler->sv[0] = -1;
} }
} }
...@@ -129,9 +124,7 @@ void lxc_sync_fini_child(struct lxc_handler *handler) ...@@ -129,9 +124,7 @@ void lxc_sync_fini_child(struct lxc_handler *handler)
void lxc_sync_fini_parent(struct lxc_handler *handler) void lxc_sync_fini_parent(struct lxc_handler *handler)
{ {
if (handler->sv[1] != -1) { if (handler->sv[1] != -1) {
process_lock();
close(handler->sv[1]); close(handler->sv[1]);
process_unlock();
handler->sv[1] = -1; handler->sv[1] = -1;
} }
} }
......
src/lxc/utils.c
...@@ -61,9 +61,7 @@ static int _recursive_rmdir_onedev(char *dirname, dev_t pdev) ...@@ -61,9 +61,7 @@ static int _recursive_rmdir_onedev(char *dirname, dev_t pdev)
int ret, failed=0; int ret, failed=0;
char pathname[MAXPATHLEN]; char pathname[MAXPATHLEN];
process_lock();
dir = opendir(dirname); dir = opendir(dirname);
process_unlock();
if (!dir) { if (!dir) {
ERROR("%s: failed to open %s", __func__, dirname); ERROR("%s: failed to open %s", __func__, dirname);
return -1; return -1;
...@@ -110,9 +108,7 @@ static int _recursive_rmdir_onedev(char *dirname, dev_t pdev) ...@@ -110,9 +108,7 @@ static int _recursive_rmdir_onedev(char *dirname, dev_t pdev)
failed=1; failed=1;
} }
process_lock();
ret = closedir(dir); ret = closedir(dir);
process_unlock();
if (ret) { if (ret) {
ERROR("%s: failed to close directory %s", __func__, dirname); ERROR("%s: failed to close directory %s", __func__, dirname);
failed=1; failed=1;
...@@ -303,10 +299,8 @@ const char *lxc_global_config_value(const char *option_name) ...@@ -303,10 +299,8 @@ const char *lxc_global_config_value(const char *option_name)
} }
static_unlock(); static_unlock();
process_lock();
fin = fopen_cloexec(user_config_path, "r"); fin = fopen_cloexec(user_config_path, "r");
free(user_config_path); free(user_config_path);
process_unlock();
if (fin) { if (fin) {
while (fgets(buf, 1024, fin)) { while (fgets(buf, 1024, fin)) {
if (buf[0] == '#') if (buf[0] == '#')
...@@ -362,10 +356,8 @@ const char *lxc_global_config_value(const char *option_name) ...@@ -362,10 +356,8 @@ const char *lxc_global_config_value(const char *option_name)
static_unlock(); static_unlock();
out: out:
process_lock();
if (fin) if (fin)
fclose(fin); fclose(fin);
process_unlock();
static_lock(); static_lock();
value = values[i]; value = values[i];
...@@ -482,15 +474,6 @@ ssize_t lxc_read_nointr_expect(int fd, void* buf, size_t count, const void* expe ...@@ -482,15 +474,6 @@ ssize_t lxc_read_nointr_expect(int fd, void* buf, size_t count, const void* expe
return ret; return ret;
} }
static inline int lock_fclose(FILE *f)
{
int ret;
process_lock();
ret = fclose(f);
process_unlock();
return ret;
}
#if HAVE_LIBGNUTLS #if HAVE_LIBGNUTLS
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <gnutls/crypto.h> #include <gnutls/crypto.h>
...@@ -510,40 +493,38 @@ int sha1sum_file(char *fnam, unsigned char *digest) ...@@ -510,40 +493,38 @@ int sha1sum_file(char *fnam, unsigned char *digest)
if (!fnam) if (!fnam)
return -1; return -1;
process_lock();
f = fopen_cloexec(fnam, "r"); f = fopen_cloexec(fnam, "r");
process_unlock();
if (!f) { if (!f) {
SYSERROR("Error opening template"); SYSERROR("Error opening template");
return -1; return -1;
} }
if (fseek(f, 0, SEEK_END) < 0) { if (fseek(f, 0, SEEK_END) < 0) {
SYSERROR("Error seeking to end of template"); SYSERROR("Error seeking to end of template");
lock_fclose(f); fclose(f);
return -1; return -1;
} }
if ((flen = ftell(f)) < 0) { if ((flen = ftell(f)) < 0) {
SYSERROR("Error telling size of template"); SYSERROR("Error telling size of template");
lock_fclose(f); fclose(f);
return -1; return -1;
} }
if (fseek(f, 0, SEEK_SET) < 0) { if (fseek(f, 0, SEEK_SET) < 0) {
SYSERROR("Error seeking to start of template"); SYSERROR("Error seeking to start of template");
lock_fclose(f); fclose(f);
return -1; return -1;
} }
if ((buf = malloc(flen+1)) == NULL) { if ((buf = malloc(flen+1)) == NULL) {
SYSERROR("Out of memory"); SYSERROR("Out of memory");
lock_fclose(f); fclose(f);
return -1; return -1;
} }
if (fread(buf, 1, flen, f) != flen) { if (fread(buf, 1, flen, f) != flen) {
SYSERROR("Failure reading template"); SYSERROR("Failure reading template");
free(buf); free(buf);
lock_fclose(f); fclose(f);
return -1; return -1;
} }
if (lock_fclose(f) < 0) { if (fclose(f) < 0) {
SYSERROR("Failre closing template"); SYSERROR("Failre closing template");
free(buf); free(buf);
return -1; return -1;
...@@ -600,10 +581,6 @@ const char** lxc_va_arg_list_to_argv_const(va_list ap, size_t skip) ...@@ -600,10 +581,6 @@ const char** lxc_va_arg_list_to_argv_const(va_list ap, size_t skip)
return (const char**)lxc_va_arg_list_to_argv(ap, skip, 0); return (const char**)lxc_va_arg_list_to_argv(ap, skip, 0);
} }
/*
* fopen_cloexec: must be called with process_lock() held
* if it is needed.
*/
FILE *fopen_cloexec(const char *path, const char *mode) FILE *fopen_cloexec(const char *path, const char *mode)
{ {
int open_mode = 0; int open_mode = 0;
...@@ -648,7 +625,6 @@ FILE *fopen_cloexec(const char *path, const char *mode) ...@@ -648,7 +625,6 @@ FILE *fopen_cloexec(const char *path, const char *mode)
return ret; return ret;
} }
/* must be called with process_lock() held */
extern struct lxc_popen_FILE *lxc_popen(const char *command) extern struct lxc_popen_FILE *lxc_popen(const char *command)
{ {
struct lxc_popen_FILE *fp = NULL; struct lxc_popen_FILE *fp = NULL;
...@@ -746,7 +722,6 @@ error: ...@@ -746,7 +722,6 @@ error:
return NULL; return NULL;
} }
/* must be called with process_lock() held */
extern int lxc_pclose(struct lxc_popen_FILE *fp) extern int lxc_pclose(struct lxc_popen_FILE *fp)
{ {
FILE *f = NULL; FILE *f = NULL;
...@@ -1086,9 +1061,7 @@ int lxc_write_to_file(const char *filename, const void* buf, size_t count, bool ...@@ -1086,9 +1061,7 @@ int lxc_write_to_file(const char *filename, const void* buf, size_t count, bool
int fd, saved_errno; int fd, saved_errno;
ssize_t ret; ssize_t ret;
process_lock();
fd = open(filename, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0666); fd = open(filename, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0666);
process_unlock();
if (fd < 0) if (fd < 0)
return -1; return -1;
ret = lxc_write_nointr(fd, buf, count); ret = lxc_write_nointr(fd, buf, count);
...@@ -1101,16 +1074,12 @@ int lxc_write_to_file(const char *filename, const void* buf, size_t count, bool ...@@ -1101,16 +1074,12 @@ int lxc_write_to_file(const char *filename, const void* buf, size_t count, bool
if (ret != 1) if (ret != 1)
goto out_error; goto out_error;
} }
process_lock();
close(fd); close(fd);
process_unlock();
return 0; return 0;
out_error: out_error:
saved_errno = errno; saved_errno = errno;
process_lock();
close(fd); close(fd);
process_unlock();
errno = saved_errno; errno = saved_errno;
return -1; return -1;
} }
...@@ -1120,9 +1089,7 @@ int lxc_read_from_file(const char *filename, void* buf, size_t count) ...@@ -1120,9 +1089,7 @@ int lxc_read_from_file(const char *filename, void* buf, size_t count)
int fd = -1, saved_errno; int fd = -1, saved_errno;
ssize_t ret; ssize_t ret;
process_lock();
fd = open(filename, O_RDONLY | O_CLOEXEC); fd = open(filename, O_RDONLY | O_CLOEXEC);
process_unlock();
if (fd < 0) if (fd < 0)
return -1; return -1;
...@@ -1142,9 +1109,7 @@ int lxc_read_from_file(const char *filename, void* buf, size_t count) ...@@ -1142,9 +1109,7 @@ int lxc_read_from_file(const char *filename, void* buf, size_t count)
ERROR("read %s: %s", filename, strerror(errno)); ERROR("read %s: %s", filename, strerror(errno));
saved_errno = errno; saved_errno = errno;
process_lock();
close(fd); close(fd);
process_unlock();
errno = saved_errno; errno = saved_errno;
return ret; return ret;
} }
......
src/lxc/utils.h
...@@ -172,7 +172,6 @@ struct lxc_popen_FILE { ...@@ -172,7 +172,6 @@ struct lxc_popen_FILE {
* via sigprocmask(2) (unblocks all signals) after fork(2) but prior to calling exec(3). * via sigprocmask(2) (unblocks all signals) after fork(2) but prior to calling exec(3).
* In short, popen(command, "re") does pipe() + fork() + exec() * In short, popen(command, "re") does pipe() + fork() + exec()
* while lxc_popen(command) does pipe() + fork() + sigprocmask() + exec(). * while lxc_popen(command) does pipe() + fork() + sigprocmask() + exec().
* Must be called with process_lock() held.
* Returns pointer to struct lxc_popen_FILE, that should be freed with lxc_pclose(). * Returns pointer to struct lxc_popen_FILE, that should be freed with lxc_pclose().
* On error returns NULL. * On error returns NULL.
*/ */
...@@ -182,7 +181,6 @@ extern struct lxc_popen_FILE *lxc_popen(const char *command); ...@@ -182,7 +181,6 @@ extern struct lxc_popen_FILE *lxc_popen(const char *command);
* returned by lxc_popen(). * returned by lxc_popen().
* Waits for associated process to terminate, returns its exit status and * Waits for associated process to terminate, returns its exit status and
* frees resources, pointed to by struct lxc_popen_FILE *. * frees resources, pointed to by struct lxc_popen_FILE *.
* Must be called with process_lock() held.
*/ */
extern int lxc_pclose(struct lxc_popen_FILE *fp); extern int lxc_pclose(struct lxc_popen_FILE *fp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment