emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mount: set up RO loop device if mount -o ro. Closes 4784

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-06-21 12:08:56 +02:00
parent 1d7ad7a022
commit 9ee4266490
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
util-linux/mount.c
View File

@ -450,9 +450,9 @@ static void append_mount_options(char **oldopts, const char *newopts)
// Use the mount_options list to parse options into flags. // Use the mount_options list to parse options into flags.
// Also update list of unrecognized options if unrecognized != NULL // Also update list of unrecognized options if unrecognized != NULL
static long parse_mount_options(char *options, char **unrecognized) static unsigned long parse_mount_options(char *options, char **unrecognized)
{ {
long flags = MS_SILENT; unsigned long flags = MS_SILENT;
// Loop through options // Loop through options
for (;;) { for (;;) {
@ -466,7 +466,7 @@ static long parse_mount_options(char *options, char **unrecognized)
// Find this option in mount_options // Find this option in mount_options
for (i = 0; i < ARRAY_SIZE(mount_options); i++) { for (i = 0; i < ARRAY_SIZE(mount_options); i++) {
if (strcasecmp(option_str, options) == 0) { if (strcasecmp(option_str, options) == 0) {
long fl = mount_options[i]; unsigned long fl = mount_options[i];
if (fl < 0) if (fl < 0)
flags &= fl; flags &= fl;
else else
@ -548,7 +548,7 @@ void delete_block_backed_filesystems(void);
// Perform actual mount of specific filesystem at specific location. // Perform actual mount of specific filesystem at specific location.
// NB: mp->xxx fields may be trashed on exit // NB: mp->xxx fields may be trashed on exit
static int mount_it_now(struct mntent *mp, long vfsflags, char *filteropts) static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filteropts)
{ {
int rc = 0; int rc = 0;
@ -1080,7 +1080,7 @@ static void error_msg_rpc(const char *msg)
} }
/* NB: mp->xxx fields may be trashed on exit */ /* NB: mp->xxx fields may be trashed on exit */
static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts) static NOINLINE int nfsmount(struct mntent *mp, unsigned long vfsflags, char *filteropts)
{ {
CLIENT *mclient; CLIENT *mclient;
char *hostname; char *hostname;
@ -1711,7 +1711,7 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
* For older kernels, you must build busybox with ENABLE_FEATURE_MOUNT_NFS. * For older kernels, you must build busybox with ENABLE_FEATURE_MOUNT_NFS.
* (However, note that then you lose any chances that NFS over IPv6 would work). * (However, note that then you lose any chances that NFS over IPv6 would work).
*/ */
static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts) static int nfsmount(struct mntent *mp, unsigned long vfsflags, char *filteropts)
{ {
len_and_sockaddr *lsa; len_and_sockaddr *lsa;
char *opts; char *opts;
@ -1753,7 +1753,7 @@ static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
static int singlemount(struct mntent *mp, int ignore_busy) static int singlemount(struct mntent *mp, int ignore_busy)
{ {
int rc = -1; int rc = -1;
long vfsflags; unsigned long vfsflags;
char *loopFile = NULL, *filteropts = NULL; char *loopFile = NULL, *filteropts = NULL;
llist_t *fl = NULL; llist_t *fl = NULL;
struct stat st; struct stat st;
@ -1854,7 +1854,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
if (ENABLE_FEATURE_MOUNT_LOOP && S_ISREG(st.st_mode)) { if (ENABLE_FEATURE_MOUNT_LOOP && S_ISREG(st.st_mode)) {
loopFile = bb_simplify_path(mp->mnt_fsname); loopFile = bb_simplify_path(mp->mnt_fsname);
mp->mnt_fsname = NULL; // will receive malloced loop dev name mp->mnt_fsname = NULL; // will receive malloced loop dev name
if (set_loop(&mp->mnt_fsname, loopFile, 0, /*ro:*/ 0) < 0) { if (set_loop(&mp->mnt_fsname, loopFile, 0, /*ro:*/ (vfsflags & MS_RDONLY)) < 0) {
if (errno == EPERM || errno == EACCES) if (errno == EPERM || errno == EACCES)
bb_error_msg(bb_msg_perm_denied_are_you_root); bb_error_msg(bb_msg_perm_denied_are_you_root);
else else
@ -1992,6 +1992,7 @@ int mount_main(int argc UNUSED_PARAM, char **argv)
FILE *fstab; FILE *fstab;
int i, j; int i, j;
int rc = EXIT_SUCCESS; int rc = EXIT_SUCCESS;
unsigned long cmdopt_flags;
unsigned opt; unsigned opt;
struct mntent mtpair[2], *mtcur = mtpair; struct mntent mtpair[2], *mtcur = mtpair;
IF_NOT_DESKTOP(const int nonroot = 0;) IF_NOT_DESKTOP(const int nonroot = 0;)
@ -2066,16 +2067,16 @@ int mount_main(int argc UNUSED_PARAM, char **argv)
// Past this point, we are handling either "mount -a [opts]" // Past this point, we are handling either "mount -a [opts]"
// or "mount [opts] single_param" // or "mount [opts] single_param"
i = parse_mount_options(cmdopts, NULL); // FIXME: should be "long", not "int" cmdopt_flags = parse_mount_options(cmdopts, NULL);
if (nonroot && (i & ~MS_SILENT)) // Non-root users cannot specify flags if (nonroot && (cmdopt_flags & ~MS_SILENT)) // Non-root users cannot specify flags
bb_error_msg_and_die(bb_msg_you_must_be_root); bb_error_msg_and_die(bb_msg_you_must_be_root);
// If we have a shared subtree flag, don't worry about fstab or mtab. // If we have a shared subtree flag, don't worry about fstab or mtab.
if (ENABLE_FEATURE_MOUNT_FLAGS if (ENABLE_FEATURE_MOUNT_FLAGS
&& (i & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE)) && (cmdopt_flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
) { ) {
// verbose_mount(source, target, type, flags, data) // verbose_mount(source, target, type, flags, data)
rc = verbose_mount("", argv[0], "", i, ""); rc = verbose_mount("", argv[0], "", cmdopt_flags, "");
if (rc) if (rc)
bb_simple_perror_msg_and_die(argv[0]); bb_simple_perror_msg_and_die(argv[0]);
return rc; return rc;
@ -2083,7 +2084,7 @@ int mount_main(int argc UNUSED_PARAM, char **argv)
// Open either fstab or mtab // Open either fstab or mtab
fstabname = "/etc/fstab"; fstabname = "/etc/fstab";
if (i & MS_REMOUNT) { if (cmdopt_flags & MS_REMOUNT) {
// WARNING. I am not sure this matches util-linux's // WARNING. I am not sure this matches util-linux's
// behavior. It's possible util-linux does not // behavior. It's possible util-linux does not
// take -o opts from mtab (takes only mount source). // take -o opts from mtab (takes only mount source).
@ -2182,7 +2183,7 @@ int mount_main(int argc UNUSED_PARAM, char **argv)
// End of fstab/mtab is reached. // End of fstab/mtab is reached.
// Were we looking for something specific? // Were we looking for something specific?
if (argv[0]) { // yes if (argv[0]) { // yes
long l; unsigned long l;
// If we didn't find anything, complain // If we didn't find anything, complain
if (!mtcur->mnt_fsname) if (!mtcur->mnt_fsname)