lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] autofs4: avoid panic on bind mount of autofs owned directory

Browse Source 
While this is not a solution to bind and move mounts on autofs owned
directories it is necessary to fix the trady error handling.

At least it avoids the kernel panic I observed checking out bug #4589.

Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ian Kent
2005-06-21 17:16:38 -07:00
committed by Linus Torvalds
parent 8818760512
commit 9b1e3afd6d
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/autofs4/autofs_i.h
View File

@@ -185,6 +185,19 @@ int autofs4_wait(struct autofs_sb_info *,struct dentry *, enum autofs_notify);
int autofs4_wait_release(struct autofs_sb_info *,autofs_wqt_t,int); int autofs4_wait_release(struct autofs_sb_info *,autofs_wqt_t,int);
void autofs4_catatonic_mode(struct autofs_sb_info *); void autofs4_catatonic_mode(struct autofs_sb_info *);
static inline int autofs4_follow_mount(struct vfsmount **mnt, struct dentry **dentry)
{
int res = 0;
while (d_mountpoint(*dentry)) {
int followed = follow_down(mnt, dentry);
if (!followed)
break;
res = 1;
}
return res;
}
static inline int simple_positive(struct dentry *dentry) static inline int simple_positive(struct dentry *dentry)
{ {
return dentry->d_inode && !d_unhashed(dentry); return dentry->d_inode && !d_unhashed(dentry);

5
fs/autofs4/expire.c
View File

@@ -56,12 +56,9 @@ static int autofs4_check_mount(struct vfsmount *mnt, struct dentry *dentry)
mntget(mnt); mntget(mnt);
dget(dentry); dget(dentry);
if (!follow_down(&mnt, &dentry)) if (!autofs4_follow_mount(&mnt, &dentry))
goto done; goto done;
while (d_mountpoint(dentry) && follow_down(&mnt, &dentry))
;
/* This is an autofs submount, we can't expire it */ /* This is an autofs submount, we can't expire it */
if (is_autofs4_dentry(dentry)) if (is_autofs4_dentry(dentry))
goto done; goto done;

6
fs/autofs4/root.c
View File

@@ -205,7 +205,11 @@ static int autofs4_dir_open(struct inode *inode, struct file *file)
struct vfsmount *fp_mnt = mntget(mnt); struct vfsmount *fp_mnt = mntget(mnt);
struct dentry *fp_dentry = dget(dentry); struct dentry *fp_dentry = dget(dentry);
while (follow_down(&fp_mnt, &fp_dentry) && d_mountpoint(fp_dentry)); if (!autofs4_follow_mount(&fp_mnt, &fp_dentry)) {
dput(fp_dentry);
mntput(fp_mnt);
return -ENOENT;
}
fp = dentry_open(fp_dentry, fp_mnt, file->f_flags); fp = dentry_open(fp_dentry, fp_mnt, file->f_flags);
status = PTR_ERR(fp); status = PTR_ERR(fp);