proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 13:31:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

conf: use mknod() to create dummy mount targets

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-07-05 00:30:21 +02:00
parent 9449f425e7
commit 3b7e332f92
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/lxc/conf.c
View File

@ -892,7 +892,7 @@ static int lxc_setup_ttys(struct lxc_conf *conf)
if (ret < 0 || (size_t)ret >= sizeof(lxcpath)) if (ret < 0 || (size_t)ret >= sizeof(lxcpath))
return -1; return -1;
ret = mknod(path, S_IFREG, 0); ret = mknod(path, S_IFREG | 0000, 0);
if (ret < 0 && errno != EEXIST) { if (ret < 0 && errno != EEXIST) {
SYSERROR("Failed to create \"%s\"", lxcpath); SYSERROR("Failed to create \"%s\"", lxcpath);
return -1; return -1;
@ -1303,7 +1303,7 @@ static int lxc_fill_autodev(const struct lxc_rootfs *rootfs)
can_mknod = 0; can_mknod = 0;
} }
ret = mknod(path, S_IFREG, 0); ret = mknod(path, S_IFREG | 0000, 0);
if (ret < 0 && errno != EEXIST) { if (ret < 0 && errno != EEXIST) {
SYSERROR("Failed to create file \"%s\"", path); SYSERROR("Failed to create file \"%s\"", path);
return -1; return -1;
@ -1593,12 +1593,11 @@ static int lxc_setup_devpts(struct lxc_conf *conf)
} }
/* Create dummy /dev/ptmx file as bind mountpoint for /dev/pts/ptmx. */ /* Create dummy /dev/ptmx file as bind mountpoint for /dev/pts/ptmx. */
ret = open("/dev/ptmx", O_CREAT, 0666); ret = mknod("/dev/ptmx", S_IFREG | 0000, 0);
if (ret < 0) { if (ret < 0 && errno != EEXIST) {
SYSERROR("Failed to create dummy \"/dev/ptmx\" file as bind mount target"); SYSERROR("Failed to create dummy \"/dev/ptmx\" file as bind mount target");
return -1; return -1;
} }
close(ret);
DEBUG("Created dummy \"/dev/ptmx\" file as bind mount target"); DEBUG("Created dummy \"/dev/ptmx\" file as bind mount target");
/* Fallback option: create symlink /dev/ptmx -> /dev/pts/ptmx */ /* Fallback option: create symlink /dev/ptmx -> /dev/pts/ptmx */
@ -1680,11 +1679,9 @@ static int lxc_setup_dev_console(const struct lxc_rootfs *rootfs,
* taken care of creating /dev/console. * taken care of creating /dev/console.
*/ */
ret = mknod(path, S_IFREG | 0000, 0); ret = mknod(path, S_IFREG | 0000, 0);
if (ret < 0) { if (ret < 0 && errno != EEXIST) {
if (errno != EEXIST) { SYSERROR("Failed to create console");
SYSERROR("Failed to create console"); return -errno;
return -errno;
}
} }
ret = fchmod(console->slave, S_IXUSR | S_IXGRP | S_IXOTH); ret = fchmod(console->slave, S_IXUSR | S_IXGRP | S_IXOTH);
@ -1708,7 +1705,7 @@ static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs,
const struct lxc_terminal *console, const struct lxc_terminal *console,
char *ttydir) char *ttydir)
{ {
int ret, fd; int ret;
char path[MAXPATHLEN], lxcpath[MAXPATHLEN]; char path[MAXPATHLEN], lxcpath[MAXPATHLEN];
char *rootfs_path = rootfs->path ? rootfs->mount : ""; char *rootfs_path = rootfs->path ? rootfs->mount : "";
@ -1731,13 +1728,11 @@ static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs,
if (ret < 0 || (size_t)ret >= sizeof(lxcpath)) if (ret < 0 || (size_t)ret >= sizeof(lxcpath))
return -1; return -1;
ret = creat(lxcpath, 0660); ret = mknod(lxcpath, S_IFREG | 0000, 0);
if (ret == -1 && errno != EEXIST) { if (ret < 0 && errno != EEXIST) {
SYSERROR("Failed to create \"%s\"", lxcpath); SYSERROR("Failed to create \"%s\"", lxcpath);
return -errno; return -errno;
} }
if (ret >= 0)
close(ret);
ret = snprintf(path, sizeof(path), "%s/dev/console", rootfs_path); ret = snprintf(path, sizeof(path), "%s/dev/console", rootfs_path);
if (ret < 0 || (size_t)ret >= sizeof(path)) if (ret < 0 || (size_t)ret >= sizeof(path))
@ -1753,17 +1748,13 @@ static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs,
} }
} }
fd = open(path, O_CREAT | O_EXCL, S_IXUSR | S_IXGRP | S_IXOTH); ret = mknod(path, S_IFREG | 0000, 0);
if (fd < 0) { if (ret < 0 && errno != EEXIST) {
if (errno != EEXIST) { SYSERROR("Failed to create console");
SYSERROR("Failed to create console"); return -errno;
return -errno;
}
} else {
close(fd);
} }
ret = chmod(console->name, S_IXUSR | S_IXGRP | S_IXOTH); ret = fchmod(console->slave, S_IXUSR | S_IXGRP | S_IXOTH);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set mode \"0%o\" to \"%s\"", SYSERROR("Failed to set mode \"0%o\" to \"%s\"",
S_IXUSR | S_IXGRP | S_IXOTH, console->name); S_IXUSR | S_IXGRP | S_IXOTH, console->name);
@ -2079,7 +2070,7 @@ static int mount_entry_create_dir_file(const struct mntent *mntent,
const struct lxc_rootfs *rootfs, const struct lxc_rootfs *rootfs,
const char *lxc_name, const char *lxc_path) const char *lxc_name, const char *lxc_path)
{ {
int fd, ret; int ret;
char *p1, *p2; char *p1, *p2;
if (strncmp(mntent->mnt_type, "overlay", 7) == 0) { if (strncmp(mntent->mnt_type, "overlay", 7) == 0) {
@ -2116,10 +2107,9 @@ static int mount_entry_create_dir_file(const struct mntent *mntent,
return -1; return -1;
} }
fd = open(path, O_CREAT, 0644); ret = mknod(path, S_IFREG | 0000, 0);
if (fd < 0) if (ret < 0 && errno != EEXIST)
return -1; return -errno;
close(fd);
return 0; return 0;
} }