diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 08:56:27 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 08:56:27 +0900 |
| commit | 2821fe6b00a1e902fd399bb4b7e40bc3041f4d44 (patch) | |
| tree | ec95a7f7e79c26abd48c82c238cdec5ac8a74d60 /fs/aio.c | |
| parent | f47671e2d861a2093179cd64dda22016664b2015 (diff) | |
| parent | 441a9d0e1e827e6433e3487145fbb0c5513301e2 (diff) | |
| download | linux-stable-2821fe6b00a1e902fd399bb4b7e40bc3041f4d44.tar.gz linux-stable-2821fe6b00a1e902fd399bb4b7e40bc3041f4d44.tar.bz2 linux-stable-2821fe6b00a1e902fd399bb4b7e40bc3041f4d44.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull VFS fixes from Al Viro:
"Several fixes, mostly for regressions in the last pile. Howeover,
prepend_path() forgetting to reininitalize dentry/vfsmount is in 3.12
as well and qib_fs had been leaking all along..."
The unpaired RCU lock issue was also independently reported by Dave
Jones with his fuzzer tool..
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
qib_fs: fix (some) dcache abuses
prepend_path() needs to reinitialize dentry/vfsmount/mnt on restarts
fix unpaired rcu lock in prepend_path()
locks: missing unlock on error in generic_add_lease()
aio: checking for NULL instead of IS_ERR
Diffstat (limited to 'fs/aio.c')
| -rw-r--r-- | fs/aio.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -163,8 +163,8 @@ static struct file *aio_private_file(struct kioctx *ctx, loff_t nr_pages) struct file *file; struct path path; struct inode *inode = alloc_anon_inode(aio_mnt->mnt_sb); - if (!inode) - return ERR_PTR(-ENOMEM); + if (IS_ERR(inode)) + return ERR_CAST(inode); inode->i_mapping->a_ops = &aio_ctx_aops; inode->i_mapping->private_data = ctx; |