proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-17 19:49:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2502 from brauner/2018-07-27/fix_max_devpts_option

Browse Source 
conf: mount devpts without "max" on EINVAL
This commit is contained in:
Stéphane Graber 2018-07-30 14:56:19 -04:00 committed by GitHub
commit e6b4213b9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lxc/conf.c
View File

@ -1612,7 +1612,7 @@ static const struct id_map *find_mapped_nsid_entry(struct lxc_conf *conf, unsign
static int lxc_setup_devpts(struct lxc_conf *conf) static int lxc_setup_devpts(struct lxc_conf *conf)
{ {
int ret; int ret;
const char *default_devpts_mntopts = "gid=5,newinstance,ptmxmode=0666,mode=0620"; char default_devpts_mntopts[] = "gid=5,newinstance,ptmxmode=0666,mode=0620";
char devpts_mntopts[256]; char devpts_mntopts[256];
if (conf->pty_max <= 0) { if (conf->pty_max <= 0) {
@ -1642,9 +1642,20 @@ static int lxc_setup_devpts(struct lxc_conf *conf)
/* mount new devpts instance */ /* mount new devpts instance */
ret = mount("devpts", "/dev/pts", "devpts", MS_NOSUID | MS_NOEXEC, devpts_mntopts); ret = mount("devpts", "/dev/pts", "devpts", MS_NOSUID | MS_NOEXEC, devpts_mntopts);
if (ret < 0) { if (ret < 0) {
/* try mounting without gid=5 */ /* try mounting without "max" */
if (errno == EINVAL) {
devpts_mntopts[sizeof(default_devpts_mntopts) - 1] = '\0';
ret = mount("devpts", "/dev/pts", "devpts", ret = mount("devpts", "/dev/pts", "devpts",
MS_NOSUID | MS_NOEXEC, devpts_mntopts + sizeof("gid=5")); MS_NOSUID | MS_NOEXEC, devpts_mntopts);
if (ret < 0) {
SYSERROR("Failed to mount new devpts instance");
return -1;
}
}
/* try mounting without gid=5 */
ret = mount("devpts", "/dev/pts", "devpts", MS_NOSUID | MS_NOEXEC,
devpts_mntopts + sizeof("gid=5"));
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to mount new devpts instance"); SYSERROR("Failed to mount new devpts instance");
return -1; return -1;