X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=e06f027f1c1d8273ce9a5b05cfff48b3fc2f60e3;hp=55d60aa63b8298032d44dfdd0b89c949976a5d7d;hb=8f61254a5d92cc89cf37df31c5ea5256f06ee4f1;hpb=f12ed63e95dec929d6893b16983233d2940a889c diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 55d60aa..e06f027 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -57,7 +57,6 @@ static struct option longopts[] = { { "read-write", 0, 0, 'w' }, { "rw", 0, 0, 'w' }, { "options", 1, 0, 'o' }, - { "nfsvers", 1, 0, 't' }, { "bind", 0, 0, 128 }, { "replace", 0, 0, 129 }, { "after", 0, 0, 130 }, @@ -99,11 +98,9 @@ static const struct opt_map opt_map[] = { { "rbind", 0, 0, MS_BIND|MS_REC }, /* Idem, plus mounted subtrees */ { "auto", 0, 0, MS_DUMMY }, /* Can be mounted using -a */ { "noauto", 0, 0, MS_DUMMY }, /* Can only be mounted explicitly */ - { "users", 1, 0, MS_USERS|MS_NOEXEC|MS_NOSUID|MS_NODEV }, - /* Allow ordinary user to mount */ + { "users", 1, 0, MS_USERS }, /* Allow ordinary user to mount */ { "nousers", 0, 1, MS_DUMMY }, /* Forbid ordinary user to mount */ - { "user", 1, 0, MS_USER|MS_NOEXEC|MS_NOSUID|MS_NODEV }, - /* Allow ordinary user to mount */ + { "user", 1, 0, MS_USER }, /* Allow ordinary user to mount */ { "nouser", 0, 1, MS_DUMMY }, /* Forbid ordinary user to mount */ { "owner", 0, 0, MS_DUMMY }, /* Let the owner of the device mount */ { "noowner", 0, 0, MS_DUMMY }, /* Device owner has no special privs */ @@ -179,9 +176,15 @@ int add_mtab(char *fsname, char *mount_point, char *fstype, int flags, char *opt ment.mnt_freq = 0; ment.mnt_passno= 0; + if(flags & MS_REMOUNT) { + update_mtab(ment.mnt_dir, &ment); + return 0; + } + lock_mtab(); if ((mtab = setmntent(MOUNTED, "a+")) == NULL) { + unlock_mtab(); fprintf(stderr, "Can't open " MOUNTED); return 1; } @@ -214,17 +217,18 @@ int do_mount_syscall(char *spec, char *node, char *type, int flags, void *data) void mount_usage() { - printf("usage: %s remotetarget dir [-rvVwfnh] [-t version] [-o nfsoptions]\n", progname); - printf("options:\n\t-r\t\tMount file system readonly\n"); + printf("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n", + progname); + printf("options:\n"); + printf("\t-r\t\tMount file system readonly\n"); printf("\t-v\t\tVerbose\n"); printf("\t-V\t\tPrint version\n"); printf("\t-w\t\tMount file system read-write\n"); - printf("\t-f\t\tFake mount, don't actually mount\n"); + printf("\t-f\t\tFake mount, do not actually mount\n"); printf("\t-n\t\tDo not update /etc/mtab\n"); printf("\t-s\t\tTolerate sloppy mount options rather than failing.\n"); printf("\t-h\t\tPrint this help\n"); - printf("\tversion\t\tnfs4 - NFS version 4, nfs - older NFS version supported\n"); - printf("\tnfsoptions\tRefer mount.nfs(8) or nfs(5)\n\n"); + printf("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n"); } static inline void @@ -256,38 +260,103 @@ static void parse_opts (const char *options, int *flags, char **extra_opts) { if (options != NULL) { char *opts = xstrdup(options); - char *opt; - int len = strlen(opts) + 20; + char *opt, *p; + int len = strlen(opts) + 1; /* include room for a null */ + int open_quote = 0; *extra_opts = xmalloc(len); **extra_opts = '\0'; - for (opt = strtok(opts, ","); opt; opt = strtok(NULL, ",")) - parse_opt(opt, flags, *extra_opts, len); - + for (p=opts, opt=NULL; p && *p; p++) { + if (!opt) + opt = p; /* begin of the option item */ + if (*p == '"') + open_quote ^= 1; /* reverse the status */ + if (open_quote) + continue; /* still in a quoted block */ + if (*p == ',') + *p = '\0'; /* terminate the option item */ + /* end of option item or last item */ + if (*p == '\0' || *(p+1) == '\0') { + parse_opt(opt, flags, *extra_opts, len); + opt = NULL; + } + } free(opts); } - } -static void mount_error(char *node) +static void mount_error(char *mntpnt, char *node) { switch(errno) { case ENOTDIR: - fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node); + fprintf(stderr, "%s: mount point %s is not a directory\n", + progname, mntpnt); break; case EBUSY: - fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node); + fprintf(stderr, "%s: %s is already mounted or busy\n", + progname, mntpnt); break; case ENOENT: - fprintf(stderr, "%s: mount point %s does not exist\n", progname, node); + if (node) { + fprintf(stderr, "%s: %s failed, reason given by server: %s\n", + progname, node, strerror(errno)); + } else + fprintf(stderr, "%s: mount point %s does not exist\n", + progname, mntpnt); break; default: fprintf(stderr, "%s: %s\n", progname, strerror(errno)); } } +static int chk_mountpoint(char *mount_point) +{ + struct stat sb; + + if (stat(mount_point, &sb) < 0){ + mount_error(mount_point, NULL); + return 1; + } + if (S_ISDIR(sb.st_mode) == 0){ + errno = ENOTDIR; + mount_error(mount_point, NULL); + return 1; + } + if (access(mount_point, X_OK) < 0) { + mount_error(mount_point, NULL); + return 1; + } + + return 0; +} + +extern u_short getport( + struct sockaddr_in *saddr, + u_long prog, + u_long vers, + u_int prot); -static void start_statd() +static int probe_statd() +{ + struct sockaddr_in addr; + u_short port; + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + port = getport(&addr, 100024, 1, IPPROTO_UDP); + + if (port == 0) + return 0; + addr.sin_port = htons(port); + + if (clnt_ping(&addr, 100024, 1, IPPROTO_UDP, NULL) <= 0) + return 0; + + return 1; +} + +static int start_statd() { /* If /var/run/rpc.statd.pid exists and is non-empty, * assume statd already running. @@ -296,42 +365,39 @@ static void start_statd() * else run that file (typically a shell script) */ struct stat stb; - if (stat("/var/run/rpc.statd.pid", &stb) == 0 && - stb.st_size > 0) - return; + + if (probe_statd()) + return 1; #ifdef START_STATD if (stat(START_STATD, &stb) ==0 && S_ISREG(stb.st_mode) && - (stb.st_mode & S_IXUSR)) + (stb.st_mode & S_IXUSR)) { system(START_STATD); + if (probe_statd()) + return 1; + } #endif + return 0; } int main(int argc, char *argv[]) { - int c, flags = 0, nfs_mount_vers = 0, mnt_err = 1, fake = 0; - char *spec, *mount_point, *extra_opts = NULL; - char *mount_opts = NULL, *p; + int c, flags = 0, mnt_err = 1, fake = 0; + char *spec, *mount_point, *fs_type = "nfs"; + char *extra_opts = NULL, *mount_opts = NULL; uid_t uid = getuid(); - progname = argv[0]; - if ((p = strrchr(progname, '/')) != NULL) - progname = p+1; + progname = basename(argv[0]); if(!strncmp(progname, "umount", strlen("umount"))) { if(argc < 2) { umount_usage(); exit(1); } - exit(nfsumount(argc, argv) ? 0 : 1); - } - - if ((argc < 2)) { - mount_usage(); - exit(1); + exit(nfsumount(argc, argv)); } - if(argv[1][0] == '-') { + if(argv[1] && argv[1][0] == '-') { if(argv[1][1] == 'V') printf("%s ("PACKAGE_STRING")\n", progname); else @@ -339,15 +405,21 @@ int main(int argc, char *argv[]) return 0; } - while ((c = getopt_long (argc - 2, argv + 2, "rt:vVwfno:hs", + if ((argc < 3)) { + mount_usage(); + exit(1); + } + + spec = argv[1]; + mount_point = argv[2]; + + argv[2] = argv[0]; /* so that getopt error messages are correct */ + while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hs", longopts, NULL)) != -1) { switch (c) { case 'r': flags |= MS_RDONLY; break; - case 't': - nfs_mount_vers = (strncmp(optarg, "nfs4", 4)) ? 0 : 4; - break; case 'v': ++verbose; break; @@ -399,27 +471,48 @@ int main(int argc, char *argv[]) exit(1); } } + if (optind != argc-2) { + /* Extra non-option words at the end... */ + mount_usage(); + exit(1); + } - spec = argv[1]; - mount_point = argv[2]; + if (strcmp(progname, "mount.nfs4") == 0) + fs_type = "nfs4"; + /* + * If a non-root user is attempting to mount, make sure the + * user's requested options match the options specified in + * /etc/fstab; otherwise, don't allow the mount. + */ if (uid != 0) { - /* don't even think about it unless options exactly - * make fstab - */ struct mntentchn *mc; if ((mc = getfsfile(mount_point)) == NULL || strcmp(mc->m.mnt_fsname, spec) != 0 || - strcmp(mc->m.mnt_opts, mount_opts) != 0) { - fprintf(stderr, "%s: permission died - no match for fstab\n", - progname); + strcmp(mc->m.mnt_type, fs_type) != 0) { + fprintf(stderr, "%s: permission denied: no match for %s " + "found in /etc/fstab\n", progname, mount_point); exit(1); } + + /* + * 'mount' munges the options from fstab before passing them + * to us, so it is non-trivial to test that we have the correct + * set of options and we don't want to trust what the user + * gave us, so just take whatever is in /etc/fstab. + */ + mount_opts = strdup(mc->m.mnt_opts); mounttype = 0; } mount_point = canonicalize(mount_point); + if (mount_point == NULL || + mount_point[0] != '/') { + fprintf(stderr, "%s: unknown mount point %s\n", + progname, mount_point ? : ""); + exit(1); + } parse_opts(mount_opts, &flags, &extra_opts); @@ -430,36 +523,45 @@ int main(int argc, char *argv[]) } } - if (!strcmp(progname, "mount.nfs4") || nfs_mount_vers == 4) { - nfs_mount_vers = 4; + if (chk_mountpoint(mount_point)) + exit(EX_FAIL); + + if (strcmp(fs_type, "nfs4") == 0) mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0); - } - else if (!strcmp(progname, "mount.nfs")) { + else { int need_statd = 0; mnt_err = nfsmount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0, &need_statd); - if (!mnt_err && !fake && need_statd) - start_statd(); + if (!mnt_err && !fake && need_statd) { + if (!start_statd()) { + fprintf(stderr, + "%s: rpc.statd is not running but is " + "required for remote locking\n" + " Either use \"-o nolocks\" to keep " + "locks local, or start statd.\n", + progname); + exit(1); + } + } } if (mnt_err) exit(EX_FAIL); if (!fake) { - mnt_err = do_mount_syscall(spec, mount_point, - nfs_mount_vers == 4 ? "nfs4" : "nfs", - flags, mount_opts); + mnt_err = do_mount_syscall(spec, mount_point, fs_type, + flags & ~(MS_USER|MS_USERS) , + mount_opts); if (mnt_err) { - mount_error(mount_point); + mount_error(mount_point, spec); exit(EX_FAIL); } } if (!nomtab) - add_mtab(spec, mount_point, - nfs_mount_vers == 4 ? "nfs4" : "nfs", + add_mtab(spec, mount_point, fs_type, flags, extra_opts, 0, 0); return 0;