autofs4 - make autofs type usage explicit
Subsystems (2)
Ian Kent
maintainerPATCH 1/2 autofs4 - make autofs type usage explicit
This patch further improves autofs mount type usage and provides supplementry explanation of the changes made in the previous patch "autofs4 - cleanup autofs mount type usage".
Changes introduced in "autofs4 - cleanup autofs mount type usage":
- the type assigned at mount when no type is given is changed from 0 to AUTOFS_TYPE_INDIRECT. This was done because 0 and AUTOFS_TYPE_INDIRECT were being treated implicitly as the same type.
- previously, an offset mount had it's type set to AUTOFS_TYPE_DIRECT|AUTOFS_TYPE_OFFSET but the mount control re-implementation needs to be able distinguish all three types. So this was changed to make the type setting explicit.
- a type AUTOFS_TYPE_ANY was added for use by the re-implementation when checking if a given path is a mountpoint. It's not really a type as we use this to ask if a given path is a mountpoint in the autofs_dev_ioctl_ismountpoint() function.
Changes introduced in this patch:
- functions to set and test the autofs mount types have been added to improve readability and make the type usage explicit.
- the mount type is used from user space for the mount control re-implementtion so, for consistency, all the definitions have been moved to the user space include file include/linux/auto_fs4.h.
---
fs/autofs4/autofs_i.h | 2 - fs/autofs4/dev-ioctl.c | 4 +-- fs/autofs4/expire.c | 4 +-- fs/autofs4/inode.c | 14 +++++----- fs/autofs4/waitq.c | 8 +++--- include/linux/auto_fs4.h | 62 +++++++++++++++++++++++++++++++++++++++++++--- 6 files changed, 73 insertions(+), 21 deletions(-)
fs/autofs4/autofs_i.h +0 -2
@@ -25,8 +25,6 @@#define AUTOFS_DEV_IOCTL_IOC_FIRST (AUTOFS_DEV_IOCTL_VERSION)#define AUTOFS_DEV_IOCTL_IOC_COUNT (AUTOFS_IOC_COUNT - 11) -#define AUTOFS_TYPE_TRIGGER (AUTOFS_TYPE_DIRECT|AUTOFS_TYPE_OFFSET) -#include <linux/kernel.h> #include <linux/slab.h> #include <linux/time.h>
fs/autofs4/dev-ioctl.c +2 -2
@@ -530,7 +530,7 @@ static int autofs_dev_ioctl_expire(struct file *fp, how = param->arg1; mnt = fp->f_path.mnt; -if (sbi->type &AUTOFS_TYPE_TRIGGER ) +if (autofs_type_trigger (sbi->type)) dentry =autofs4_expire_direct (sbi->sb, mnt, sbi, how);else dentry =autofs4_expire_indirect (sbi->sb, mnt, sbi, how);
@@ -612,7 +612,7 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp, param->arg2 =0 ;if (!fp || param->ioctlfd ==-1 ) { -if (type ==AUTOFS_TYPE_ANY ) { +if (autofs_type_any (type)) {struct super_block *sb; err =path_lookup (path,LOOKUP_FOLLOW , &nd);
fs/autofs4/expire.c +2 -2
@@ -63,7 +63,7 @@ static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry)struct autofs_sb_info *sbi =autofs4_sbi (dentry->d_sb);/* This is an autofs submount, we can't expire it */ -if (sbi->type ==AUTOFS_TYPE_INDIRECT ) +if (autofs_type_indirect (sbi->type)) goto done;/*
@@ -490,7 +490,7 @@ int autofs4_expire_multi(struct super_block *sb, struct vfsmount *mnt,if (arg &&get_user (do_now, arg))return -EFAULT ; -if (sbi->type &AUTOFS_TYPE_TRIGGER ) +if (autofs_type_trigger (sbi->type)) dentry =autofs4_expire_direct (sb, mnt, sbi, do_now);else dentry =autofs4_expire_indirect (sb, mnt, sbi, do_now);
fs/autofs4/inode.c +7 -7
@@ -197,9 +197,9 @@ static int autofs4_show_options(struct seq_file *m, struct vfsmount *mnt)seq_printf (m,",minproto=%d" , sbi->min_proto);seq_printf (m,",maxproto=%d" , sbi->max_proto); -if (sbi->type &AUTOFS_TYPE_OFFSET ) +if (autofs_type_offset (sbi->type))seq_printf (m,",offset" ); -else if (sbi->type &AUTOFS_TYPE_DIRECT ) +else if (autofs_type_direct (sbi->type))seq_printf (m,",direct" );else seq_printf (m,",indirect" );
@@ -284,13 +284,13 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, *maxproto = option;break ;case Opt_indirect: - *type =AUTOFS_TYPE_INDIRECT ; +set_autofs_type_indirect (type);break ;case Opt_direct: - *type =AUTOFS_TYPE_DIRECT ; +set_autofs_type_direct (type);break ;case Opt_offset: - *type =AUTOFS_TYPE_OFFSET ; +set_autofs_type_offset (type);break ;default :return 1 ;
@@ -338,7 +338,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) sbi->sb = s; sbi->version =0 ; sbi->sub_version =0 ; - sbi->type =AUTOFS_TYPE_INDIRECT ; +set_autofs_type_indirect (&sbi->type); sbi->min_proto =0 ; sbi->max_proto =0 ;mutex_init (&sbi->wq_mutex);
@@ -380,7 +380,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) } root_inode->i_fop = &autofs4_root_operations; - root_inode->i_op = sbi->type &AUTOFS_TYPE_TRIGGER ? + root_inode->i_op =autofs_type_trigger (sbi->type) ? &autofs4_direct_root_inode_operations : &autofs4_indirect_root_inode_operations;
fs/autofs4/waitq.c +4 -4
@@ -337,7 +337,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,* is very similar for indirect mounts except only dentrys * in the root of the autofs file system may be negative. */ -if (sbi->type &AUTOFS_TYPE_TRIGGER ) +if (autofs_type_trigger (sbi->type))return -ENOENT ;else if (!IS_ROOT (dentry->d_parent))return -ENOENT ;
@@ -348,7 +348,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,return -ENOMEM ;/* If this is a direct mount request create a dummy name */ -if (IS_ROOT (dentry) && sbi->type &AUTOFS_TYPE_TRIGGER ) +if (IS_ROOT (dentry) &&autofs_type_trigger (sbi->type)) qstr.len =sprintf (name,"%p" , dentry);else { qstr.len =autofs4_getpath (sbi, dentry, &name);
@@ -406,11 +406,11 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry, type = autofs_ptype_expire_multi; }else {if (notify ==NFY_MOUNT ) - type = (sbi->type &AUTOFS_TYPE_TRIGGER ) ? + type =autofs_type_trigger (sbi->type) ? autofs_ptype_missing_direct : autofs_ptype_missing_indirect;else - type = (sbi->type &AUTOFS_TYPE_TRIGGER ) ? + type =autofs_type_trigger (sbi->type) ? autofs_ptype_expire_direct : autofs_ptype_expire_indirect; }
include/linux/auto_fs4.h +58 -4
68 lines not on this page · raw message
Ian Kent
maintainerPATCH 2/2 autofs4 - fix string validation check order
In function validate_dev_ioctl() we check that the string we've been sent is a valid path. The function that does this check assumes the string is NULL terminated but our NULL termination check isn't done until after this call. This patch changes the order of the check.
---
fs/autofs4/dev-ioctl.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
fs/autofs4/dev-ioctl.c +7 -6
@@ -124,7 +124,7 @@ static inline void free_dev_ioctl(struct autofs_dev_ioctl *param)/* * Check sanity of parameter control fields and if a path is present -* check that it has a "/" and is terminated. +* check that it is terminated and contains at least one "/". */ static int validate_dev_ioctl (int cmd,struct autofs_dev_ioctl *param) {
@@ -137,15 +137,16 @@ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param) }if (param->size >sizeof (*param)) { - err =check_name (param->path); + err =invalid_str (param->path, + (void *) ((size_t ) param + param->size));if (err) { -AUTOFS_WARN ("invalid path supplied for cmd(0x%08x)" , - cmd); +AUTOFS_WARN ( +"path string terminator missing for cmd(0x%08x)" , + cmd); goto out; } - err =invalid_str (param->path, - (void *) ((size_t ) param + param->size)); + err =check_name (param->path);if (err) {AUTOFS_WARN ("invalid path supplied for cmd(0x%08x)" , cmd);
Re: [PATCH 2/2] autofs4 - fix string validation check order
Quoted 7 lines · Ian Kent
In function
validate_dev_ioctl()we check that the string we've been sent is a valid path. The function that does this check assumes the string is NULL terminated but our NULL termination check isn't done until after this call. This patch changes the order of the check.Signed-off-by Ian Kent <[email protected]>