X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=96b56973faeeb3731dcd98d74a51d216c5378fcf;hp=b367b6474fcc7c7f90c6712804c1f3ea323db2b6;hb=f014bb7f4dbdc45572849465a6410512abffa7ea;hpb=0ec44a497a508fb631d472ce8c33041c497e1ca5 diff --git a/utils/mount/mount.c b/utils/mount/mount.c index b367b64..96b5697 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -26,12 +26,14 @@ #include #include #include +#include #include #include #include #include "fstab.h" #include "xcommon.h" +#include "nls.h" #include "mount_constants.h" #include "nfs_paths.h" @@ -39,11 +41,12 @@ #include "nfs4_mount.h" #include "nfsumount.h" #include "mount.h" +#include "error.h" char *progname; +int nfs_mount_data_version; int nomtab; int verbose; -int mounttype; int sloppy; static struct option longopts[] = { @@ -57,14 +60,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 }, - { "before", 0, 0, 131 }, - { "over", 0, 0, 132 }, - { "move", 0, 0, 133 }, - { "rbind", 0, 0, 135 }, { NULL, 0, 0, 0 } }; @@ -99,11 +94,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 */ @@ -137,6 +130,51 @@ static const struct opt_map opt_map[] = { { NULL, 0, 0, 0 } }; +#define MAKE_VERSION(p,q,r) (65536 * (p) + 256 * (q) + (r)) + +int linux_version_code(void) +{ + struct utsname my_utsname; + int p, q, r; + + if (uname(&my_utsname) == 0) { + p = atoi(strtok(my_utsname.release, ".")); + q = atoi(strtok(NULL, ".")); + r = atoi(strtok(NULL, ".")); + return MAKE_VERSION(p,q,r); + } + return 0; +} + +/* + * Choose the version of the nfs_mount_data structure that is appropriate + * for the kernel that is doing the mount. + * + * NFS_MOUNT_VERSION: maximum version supported by these sources + * nfs_mount_data_version: maximum version supported by the running kernel + */ +static void discover_nfs_mount_data_version(void) +{ + int kernel_version = linux_version_code(); + + if (kernel_version) { + if (kernel_version < MAKE_VERSION(2, 1, 32)) + nfs_mount_data_version = 1; + else if (kernel_version < MAKE_VERSION(2, 2, 18)) + nfs_mount_data_version = 3; + else if (kernel_version < MAKE_VERSION(2, 3, 0)) + nfs_mount_data_version = 4; + else if (kernel_version < MAKE_VERSION(2, 3, 99)) + nfs_mount_data_version = 3; + else if (kernel_version < MAKE_VERSION(2, 6, 3)) + nfs_mount_data_version = 4; + else + nfs_mount_data_version = 6; + } + if (nfs_mount_data_version > NFS_MOUNT_VERSION) + nfs_mount_data_version = NFS_MOUNT_VERSION; +} + /* Try to build a canonical options string. */ static char * fix_opts_string (int flags, const char *extra_opts) { const struct opt_map *om; @@ -166,50 +204,54 @@ static char * fix_opts_string (int flags, const char *extra_opts) { return new_opts; } - -int add_mtab(char *fsname, char *mount_point, char *fstype, int flags, char *opts, int freq, int passno) +static int add_mtab(char *spec, char *mount_point, char *fstype, + int flags, char *opts, int freq, int pass) { struct mntent ment; FILE *mtab; + int result = EX_FILEIO; - ment.mnt_fsname = fsname; + ment.mnt_fsname = spec; ment.mnt_dir = mount_point; ment.mnt_type = fstype; ment.mnt_opts = fix_opts_string(flags, opts); - ment.mnt_freq = 0; - ment.mnt_passno= 0; + ment.mnt_freq = freq; + ment.mnt_passno = pass; - if(flags & MS_REMOUNT) { + if (flags & MS_REMOUNT) { update_mtab(ment.mnt_dir, &ment); return 0; } lock_mtab(); - if ((mtab = setmntent(MOUNTED, "a+")) == NULL) { - fprintf(stderr, "Can't open " MOUNTED); - return 1; + if ((mtab = setmntent(MOUNTED, "a+")) == NULL) { + unlock_mtab(); + nfs_error(_("Can't open mtab: %s"), + strerror(errno)); + goto fail_unlock; } - if (addmntent(mtab, &ment) == 1) { - endmntent(mtab); - unlock_mtab(); - fprintf(stderr, "Can't write mount entry"); - return 1; + if (addmntent(mtab, &ment) == 1) { + nfs_error(_("Can't write mount entry to mtab: %s"), + strerror(errno)); + goto fail_close; } - if (fchmod(fileno(mtab), 0644) == -1) { - endmntent(mtab); - unlock_mtab(); - fprintf(stderr, "Can't set perms on " MOUNTED); - return 1; + if (fchmod(fileno(mtab), 0644) == -1) { + nfs_error(_("Can't set permissions on mtab: %s"), + strerror(errno)); + goto fail_close; } - endmntent(mtab); + result = 0; +fail_close: + endmntent(mtab); +fail_unlock: unlock_mtab(); - return 0; + return result; } int do_mount_syscall(char *spec, char *node, char *type, int flags, void *data) @@ -219,17 +261,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 @@ -287,24 +330,53 @@ static void parse_opts (const char *options, int *flags, char **extra_opts) } } -static void mount_error(char *node) +static int chk_mountpoint(char *mount_point) { - switch(errno) { - case ENOTDIR: - fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node); - break; - case EBUSY: - fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node); - break; - case ENOENT: - fprintf(stderr, "%s: mount point %s does not exist\n", progname, node); - break; - default: - fprintf(stderr, "%s: %s\n", progname, strerror(errno)); + struct stat sb; + + if (stat(mount_point, &sb) < 0){ + mount_error(NULL, mount_point, errno); + return 1; + } + if (S_ISDIR(sb.st_mode) == 0){ + mount_error(NULL, mount_point, ENOTDIR); + return 1; + } + if (access(mount_point, X_OK) < 0) { + mount_error(NULL, mount_point, errno); + return 1; } + + return 0; } -static void start_statd() +extern u_short getport( + struct sockaddr_in *saddr, + u_long prog, + u_long vers, + u_int prot); + +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. @@ -313,37 +385,38 @@ 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 (!progname) - exit(2); + progname = basename(argv[0]); - if ((p = strrchr(progname, '/')) != NULL) - progname = p+1; + discover_nfs_mount_data_version(); if(!strncmp(progname, "umount", strlen("umount"))) { if(argc < 2) { umount_usage(); exit(1); } - exit(nfsumount(argc, argv) ? 0 : 1); + exit(nfsumount(argc, argv)); } if(argv[1] && argv[1][0] == '-') { @@ -363,23 +436,12 @@ int main(int argc, char *argv[]) mount_point = argv[2]; argv[2] = argv[0]; /* so that getopt error messages are correct */ - while ((c = getopt_long (argc - 2, argv + 2, "rt:vVwfno:hs", + while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hs", longopts, NULL)) != -1) { switch (c) { case 'r': flags |= MS_RDONLY; break; - case 't': - if (strcmp(optarg, "nfs4") == 0) - nfs_mount_vers = 4; - else if (strcmp(optarg, "nfs") == 0) - nfs_mount_vers = 0; - else { - fprintf(stderr, "%s: unknown filesystem type: %s\n", - progname, optarg); - exit(1); - } - break; case 'v': ++verbose; break; @@ -404,27 +466,6 @@ int main(int argc, char *argv[]) case 's': ++sloppy; break; - case 128: /* bind */ - mounttype = MS_BIND; - break; - case 129: /* replace */ - mounttype = MS_REPLACE; - break; - case 130: /* after */ - mounttype = MS_AFTER; - break; - case 131: /* before */ - mounttype = MS_BEFORE; - break; - case 132: /* over */ - mounttype = MS_OVER; - break; - case 133: /* move */ - mounttype = MS_MOVE; - break; - case 135: /* rbind */ - mounttype = MS_BIND | MS_REC; - break; case 'h': default: mount_usage(); @@ -438,29 +479,31 @@ int main(int argc, char *argv[]) } if (strcmp(progname, "mount.nfs4") == 0) - nfs_mount_vers = 4; + 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 - * match fstab - */ struct mntentchn *mc; if ((mc = getfsfile(mount_point)) == NULL || strcmp(mc->m.mnt_fsname, spec) != 0 || - strcmp(mc->m.mnt_type, (nfs_mount_vers == 4 ? "nfs4":"nfs")) != 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 + + /* + * '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 fstab + * gave us, so just take whatever is in /etc/fstab. */ mount_opts = strdup(mc->m.mnt_opts); - mounttype = 0; } mount_point = canonicalize(mount_point); @@ -480,37 +523,47 @@ int main(int argc, char *argv[]) } } - if (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 { 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", + 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(spec, mount_point, errno); exit(EX_FAIL); } } if (!nomtab) - add_mtab(spec, mount_point, - nfs_mount_vers == 4 ? "nfs4" : "nfs", - flags, extra_opts, 0, 0); + mnt_err = add_mtab(spec, mount_point, fs_type, flags, extra_opts, + 0, 0 /* these are always zero for NFS */ ); - return 0; + exit(mnt_err); }