diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 19:12:49 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 19:12:49 -0400 |
| commit | 4c2cb58c552a34744979a99ccf01762d5eb7e288 (patch) | |
| tree | fd35360eb0cb08b07f3a5f4bdf1ebd90a769311d /fs | |
| parent | 34123da66e613602de5a886b05c875b6a91b8ed2 (diff) | |
| parent | 72ab373a5688a78cbdaf3bf96012e597d5399bb7 (diff) | |
| download | op-kernel-dev-4c2cb58c552a34744979a99ccf01762d5eb7e288.zip op-kernel-dev-4c2cb58c552a34744979a99ccf01762d5eb7e288.tar.gz | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/aio.c | 6 | ||||
| -rw-r--r-- | fs/hfsplus/super.c | 1 | ||||
| -rw-r--r-- | fs/inotify.c | 1 |
3 files changed, 8 insertions, 0 deletions
@@ -1397,6 +1397,9 @@ static ssize_t aio_setup_iocb(struct kiocb *kiocb) if (unlikely(!access_ok(VERIFY_WRITE, kiocb->ki_buf, kiocb->ki_left))) break; + ret = security_file_permission(file, MAY_READ); + if (unlikely(ret)) + break; ret = -EINVAL; if (file->f_op->aio_read) kiocb->ki_retry = aio_pread; @@ -1409,6 +1412,9 @@ static ssize_t aio_setup_iocb(struct kiocb *kiocb) if (unlikely(!access_ok(VERIFY_READ, kiocb->ki_buf, kiocb->ki_left))) break; + ret = security_file_permission(file, MAY_WRITE); + if (unlikely(ret)) + break; ret = -EINVAL; if (file->f_op->aio_write) kiocb->ki_retry = aio_pwrite; diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index fd0f0f0..452fc1f 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c @@ -50,6 +50,7 @@ static void hfsplus_read_inode(struct inode *inode) init_MUTEX(&HFSPLUS_I(inode).extents_lock); HFSPLUS_I(inode).flags = 0; HFSPLUS_I(inode).rsrc_inode = NULL; + atomic_set(&HFSPLUS_I(inode).opencnt, 0); if (inode->i_ino >= HFSPLUS_FIRSTUSER_CNID) { read_inode: diff --git a/fs/inotify.c b/fs/inotify.c index a37e9fb..9fbaebf 100644 --- a/fs/inotify.c +++ b/fs/inotify.c @@ -176,6 +176,7 @@ static inline void put_inotify_dev(struct inotify_device *dev) if (atomic_dec_and_test(&dev->count)) { atomic_dec(&dev->user->inotify_devs); free_uid(dev->user); + idr_destroy(&dev->idr); kfree(dev); } } |
