unsigned long xflag;
unsigned long mask;
char * data;
+ char * data_parsed;
};
struct Options {
unsigned long const xflag;
bool const is_dflt;
} const FSTAB_OPTIONS[] = {
- { "defaults", 0, (MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC|
+ { "defaults", MS_NODEV, (MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC|
MS_SYNCHRONOUS), 0, false },
{ "rbind", MS_BIND|MS_REC, MS_BIND|MS_REC, 0, false },
{ "bind", MS_BIND, MS_BIND, 0, false },
{ "noauto", 0, 0, XFLAG_NOAUTO, false },
{ "user", 0, 0, 0, false },
{ "nouser", 0, 0, 0, false },
+ { "rec", MS_REC, MS_REC, 0, false },
+ { "unbindable", MS_UNBINDABLE, MS_UNBINDABLE, 0, false },
+ { "private", MS_PRIVATE, MS_PRIVATE, 0, false },
+ { "slave", MS_SLAVE, MS_SLAVE, 0, false },
+ { "shared", MS_SHARED, MS_SHARED, 0, false },
};
int wrapper_exit_code = 1;
goto err0;
}
- if (flock(fd, LOCK_EX)==-1) {
- perror("secure-mount: flock()");
+ if (lockf(fd, F_LOCK, 0)==-1) {
+ perror("secure-mount: lockf()");
goto err1;
}
if (canHandleInternal(mnt)) {
if (mount(mnt->src, ".",
mnt->type ? mnt->type : "",
- mnt->flag, mnt->data)==-1) {
+ mnt->flag, mnt->data_parsed)==-1) {
perror("secure-mount: mount()");
return false;
}
+ if ((mnt->flag & MS_BIND) &&
+ (mnt->flag & ~(MS_BIND|MS_REC))) {
+ /* This is needed to put us in the new mountpoint */
+ if (!secureChdir(mnt->dst, opt))
+ return false;
+ if (mount(mnt->src, ".",
+ mnt->type ? mnt->type : "",
+ ((mnt->flag & ~(MS_BIND|MS_REC)) |
+ MS_REMOUNT), NULL) == -1 &&
+ errno != EBUSY) { /* Returned on older kernels */
+ perror("secure-mount: mount()");
+ return false;
+ }
+ }
}
else if (!callExternalMount(mnt))
return false;
} while (*ptr!='\0');
- info->data = data;
+ info->data_parsed = data;
return true;
}