| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <59e9d9fe9db11c6e06ef314541b1112f2b720a59.1285278339.git.matthltc@us.ibm.com>
Date: Thu, 23 Sep 2010 14:53:29 -0700
From: Matt Helsley <matthltc@...ibm.com>
To: containers@...ts.linux-foundation.org
Cc: Matt Helsley <matthltc@...ibm.com>,
Eric Sandeen <sandeen@...hat.com>,
"Theodore Ts'o" <tytso@....edu>,
Andreas Dilger <adilger.kernel@...ger.ca>,
linux-ext4@...r.kernel.org, Jan Kara <jack@...e.cz>,
Oren Laadan <orenl@...columbia.edu>,
Amir Goldstein <amir73il@...rs.sf.net>,
linux-fsdevel@...r.kernel.org, Al Viro <viro@...iv.linux.org.uk>,
Christoph Hellwig <hch@...radead.org>,
Jamie Lokier <jamie@...reable.org>
Subject: [PATCH 3/6] [RFC] ext3/4: Allow relinking to unlinked files
Orphan inodes (nlink == 0) have been forbidden from being linked back
into the ext3/4 filesystems as a means of dealing with a link/unlink
"race".
This patch effectively reverts 2988a7740dc0dd9a0cb56576e8fe1d777dff0db3
"return ENOENT from ext3_link when racing with unlink"
which was discussed in the lkml thread:
http://lkml.org/lkml/2007/1/12/200
The reverted commit was selected because disallowing relinking was just a
simpler solution -- not because removing tasks from the orphan list
was deemed difficult or incorrect.
Instead this patch utilizes the original patch proposed by Eric Sandeen.
Testing this patch with the orphan-repro.tar.bz2 code linked in that
thread seems to confirm that this patch does not reintroduce the OOPs.
Nonetheless, Amir Goldstein pointed out that if ext3_add_entry() fails
we'll also be left with a corrupted orphan list. So I've moved the orphan
removal code down to the spot where a successful return has been assured.
Eric's Original description (indented):
Remove inode from the orphan list in ext3_link() if we might have
raced with ext3_unlink(), which potentially put it on the list.
If we're on the list with nlink > 0, we'll never get cleaned up
properly and eventually may corrupt the list.
Unlike the reverted patch, this patch enables relinking an orphan inode
back into the filesystem. This relinking is extremely useful for
checkpoint/restart since it avoids incredibly costly and complex methods
of supporting checkpoint of tasks with open unlinked files. More on
how relink will be used can be found in the checkpoint/restart patches posted
with this patch.
Though relinking is a useful operation it may not be possible on all
filesystems. It appears to be possible in ext3/4 so this patch changes the
ext3/ext4 link functions to allow it and provide the .relink file operation
introduced earlier.
This assumes that in ext3/4 data written to unlinked files is not stored any
differently than data written to linked files. If that is not the case
I'd appreciate any pointers to the code showing where/how they are
handled differently. All I could find in ext3/4 was the orphan inode list.
Signed-off-by: Matt Helsley <matthltc@...ibm.com>
Cc: Eric Sandeen <sandeen@...hat.com>
Cc: Theodore Ts'o <tytso@....edu>
Cc: Andreas Dilger <adilger.kernel@...ger.ca>
Cc: linux-ext4@...r.kernel.org
Cc: Jan Kara <jack@...e.cz>
Cc: containers@...ts.linux-foundation.org
Cc: Oren Laadan <orenl@...columbia.edu>
Cc: Amir Goldstein <amir73il@...rs.sf.net>
Cc: linux-fsdevel@...r.kernel.org
Cc: Al Viro <viro@...iv.linux.org.uk>
Cc: Christoph Hellwig <hch@...radead.org>
Cc: Jamie Lokier <jamie@...reable.org>
---
fs/ext3/namei.c | 16 ++++++++--------
fs/ext4/namei.c | 14 +++++++-------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index ee18408..e49310c 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -1985,7 +1985,7 @@ out_unlock:
/*
* ext3_orphan_del() removes an unlinked or truncated inode from the list
- * of such inodes stored on disk, because it is finally being cleaned up.
+ * of such inodes stored on disk.
*/
int ext3_orphan_del(handle_t *handle, struct inode *inode)
{
@@ -2243,13 +2243,6 @@ static int ext3_link (struct dentry * old_dentry,
dquot_initialize(dir);
- /*
- * 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) +
EXT3_INDEX_EXTRA_TRANS_BLOCKS);
@@ -2267,6 +2260,12 @@ retry:
if (!err) {
ext3_mark_inode_dirty(handle, inode);
d_instantiate(dentry, inode);
+ if (inode->i_nlink == 1)
+ /*
+ * i_nlink went from 0 to 1 thus the inode is no
+ * longer an orphan.
+ */
+ ext3_orphan_del(handle, inode);
} else {
drop_nlink(inode);
iput(inode);
@@ -2451,6 +2450,7 @@ end_rename:
const struct inode_operations ext3_dir_inode_operations = {
.create = ext3_create,
.lookup = ext3_lookup,
+ .relink = ext3_link,
.link = ext3_link,
.unlink = ext3_unlink,
.symlink = ext3_symlink,
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 0c070fa..e07c374 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2323,13 +2323,6 @@ static int ext4_link(struct dentry *old_dentry,
dquot_initialize(dir);
- /*
- * 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) +
EXT4_INDEX_EXTRA_TRANS_BLOCKS);
@@ -2347,6 +2340,12 @@ retry:
if (!err) {
ext4_mark_inode_dirty(handle, inode);
d_instantiate(dentry, inode);
+ if (inode->i_nlink == 1)
+ /*
+ * i_nlink went from 0 to 1 thus the inode is no
+ * longer an orphan.
+ */
+ ext4_orphan_del(handle, inode);
} else {
drop_nlink(inode);
iput(inode);
@@ -2535,6 +2534,7 @@ end_rename:
const struct inode_operations ext4_dir_inode_operations = {
.create = ext4_create,
.lookup = ext4_lookup,
+ .relink = ext4_link,
.link = ext4_link,
.unlink = ext4_unlink,
.symlink = ext4_symlink,
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists