diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2007-02-10 01:46:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 10:51:34 -0800 |
| commit | 2988a7740dc0dd9a0cb56576e8fe1d777dff0db3 (patch) | |
| tree | 9c1b67be5d16a24d5c613ecb8e3804c7ff3994da | |
| parent | 967bb77c69e3bc44dd1128a8b503a205cce3fd4a (diff) | |
| download | blackbird-op-linux-2988a7740dc0dd9a0cb56576e8fe1d777dff0db3.tar.gz blackbird-op-linux-2988a7740dc0dd9a0cb56576e8fe1d777dff0db3.zip | |
[PATCH] return ENOENT from ext3_link when racing with unlink
Return -ENOENT from ext[34]_link if we've raced with unlink and i_nlink is
0. Doing otherwise has the potential to corrupt the orphan inode list,
because we'd wind up with an inode with a non-zero link count on the list,
and it will never get properly cleaned up & removed from the orphan list
before it is freed.
[akpm@osdl.org: build fix]
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/ext3/namei.c | 6 | ||||
| -rw-r--r-- | fs/ext4/namei.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 4df39c4315e1..57402b5f030c 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c @@ -2191,6 +2191,12 @@ static int ext3_link (struct dentry * old_dentry, if (inode->i_nlink >= EXT3_LINK_MAX) return -EMLINK; + /* + * Return -ENOENT if we've raced with unlink and i_nlink is 0. Doing + * otherwise has the potential to corrupt the orphan inode list. + */ + if (inode->i_nlink == 0) + return -ENOENT; retry: handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index e5a74a5ac261..05c0d7f8fdf9 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2189,6 +2189,12 @@ static int ext4_link (struct dentry * old_dentry, if (inode->i_nlink >= EXT4_LINK_MAX) return -EMLINK; + /* + * Return -ENOENT if we've raced with unlink and i_nlink is 0. Doing + * otherwise has the potential to corrupt the orphan inode list. + */ + if (inode->i_nlink == 0) + return -ENOENT; retry: handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) + |
