diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2001-11-11 18:20:17 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2001-11-11 18:20:17 +0000 |
| commit | 0a7077f5364454de39fb1ac486d4bd233aa11798 (patch) | |
| tree | 1eb1c74df8cde602e885f4817836cbd3c7567fbe /kernel | |
| parent | 8cffdb9707f6d2b19a8cf639f1ec159bb5f55695 (diff) | |
| download | android_external_fuse-0a7077f5364454de39fb1ac486d4bd233aa11798.tar.gz android_external_fuse-0a7077f5364454de39fb1ac486d4bd233aa11798.tar.bz2 android_external_fuse-0a7077f5364454de39fb1ac486d4bd233aa11798.zip | |
x
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/Makefile.am | 4 | ||||
| -rw-r--r-- | kernel/dir.c | 16 | ||||
| -rw-r--r-- | kernel/fuse_i.h | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/kernel/Makefile.am b/kernel/Makefile.am index 4edce67..2ea0e3b 100644 --- a/kernel/Makefile.am +++ b/kernel/Makefile.am @@ -18,6 +18,10 @@ install-exec-local: fuse.o $(INSTALL) -m 644 fuse.o $(DESTDIR)$(fusemoduledir)/fuse.o /sbin/depmod -a +uninstall-local: + rm -f $(DESTDIR)$(fusemoduledir)/fuse.o + /sbin/depmod -a + clean-local: rm -f *.o *.s diff --git a/kernel/dir.c b/kernel/dir.c index 9a3d4ee..cd6394a 100644 --- a/kernel/dir.c +++ b/kernel/dir.c @@ -117,7 +117,8 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry) return ERR_PTR(ret); } -/* create needs to return a positive entry, so this also does a lookup */ +/* create needs to return a positive entry, so this is actually an + mknod+lookup */ static int fuse_mknod(struct inode *dir, struct dentry *entry, int mode, int rdev) { @@ -305,14 +306,11 @@ static int fuse_permission(struct inode *inode, int mask) { struct fuse_conn *fc = INO_FC(inode); - /* (too) simple protection for non-privileged mounts */ - if(fc->uid) { - if(current->fsuid == fc->uid) - return 0; - else - return -EACCES; - } - return 0; + /* (too) simple protection */ + if(current->fsuid == fc->uid) + return 0; + else + return -EACCES; } static int fuse_revalidate(struct dentry *entry) diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index 32106af..e8dde37 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -95,7 +95,7 @@ struct fuse_out { void *arg; }; -#define FUSE_IN_INIT { {0, 0, 0, current->fsuid, current->fsgid}, 0, 0 } +#define FUSE_IN_INIT { {0, 0, 0}, 0, 0 } #define FUSE_OUT_INIT { {0, 0}, 0, 0, 0 } |