diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2008-02-23 18:23:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 20:12:13 -0500 |
| commit | 1a823ac9ff09cbdf39201df37b7ede1f9395de83 (patch) | |
| tree | 8b61341ef969a3107cb5d3c8fb9317ec250507a6 | |
| parent | fddd9cf82c9f9617d134ae878a8f6b116ebbd43d (diff) | |
fuse: fix permission checking
I added a nasty local variable shadowing bug to fuse in 2.6.24, with the
result, that the 'default_permissions' mount option is basically ignored.
How did this happen?
- old err declaration in inner scope
- new err getting declared in outer scope
- 'return err' from inner scope getting removed
- old declaration not being noticed
-Wshadow would have saved us, but it doesn't seem practical for
the kernel :(
More testing would have also saved us :((
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/fuse/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 7fb514b6d852..c4807b3fc8a3 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c | |||
| @@ -906,7 +906,7 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd) | |||
| 906 | } | 906 | } |
| 907 | 907 | ||
| 908 | if (fc->flags & FUSE_DEFAULT_PERMISSIONS) { | 908 | if (fc->flags & FUSE_DEFAULT_PERMISSIONS) { |
| 909 | int err = generic_permission(inode, mask, NULL); | 909 | err = generic_permission(inode, mask, NULL); |
| 910 | 910 | ||
| 911 | /* If permission is denied, try to refresh file | 911 | /* If permission is denied, try to refresh file |
| 912 | attributes. This is also needed, because the root | 912 | attributes. This is also needed, because the root |