From: "Josef 'Jeff' Sipek" <jsipek@cs.sunysb.edu>
To: linux-fsdevel@vger.kernel.org
Cc: Erez Zadok <ezk@cs.sunysb.edu>,
"Josef 'Jeff' Sipek" <jsipek@cs.sunysb.edu>
Subject: [PATCH 10/13] fs/unionfs/: Fix copyup_deleted_file dentry leak
Date: Sun, 4 Mar 2007 21:16:54 -0500 [thread overview]
Message-ID: <11730610183170-git-send-email-jsipek@cs.sunysb.edu> (raw)
In-Reply-To: <11730610174005-git-send-email-jsipek@cs.sunysb.edu>
From: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
---
fs/unionfs/commonfops.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index 2664be9..aa7c75d 100644
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -41,6 +41,15 @@ static int copyup_deleted_file(struct file *file, struct dentry *dentry,
sprintf(name, ".unionfs%*.*lx",
i_inosize, i_inosize, hidden_dentry->d_inode->i_ino);
+ /*
+ * Loop, looking for an unused temp name to copyup to.
+ *
+ * It's somewhat silly that we look for a free temp tmp name in the
+ * source branch (bstart) instead of the dest branch (bindex), where
+ * the final name will be created. We _will_ catch it if somehow
+ * the name exists in the dest branch, but it'd be nice to catch it
+ * sooner than later.
+ */
tmp_dentry = NULL;
do {
char *suffix = name + nlen - countersize;
@@ -58,7 +67,9 @@ static int copyup_deleted_file(struct file *file, struct dentry *dentry,
err = PTR_ERR(tmp_dentry);
goto out;
}
+ /* don't dput here because of do-while condition eval order */
} while (tmp_dentry->d_inode != NULL); /* need negative dentry */
+ dput(tmp_dentry);
err = copyup_named_file(dentry->d_parent->d_inode, file, name, bstart,
bindex, file->f_dentry->d_inode->i_size);
--
1.5.0.2.260.g2eb065
next prev parent reply other threads:[~2007-03-05 2:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-05 2:16 [GIT PULL -mm] Unionfs updates Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 01/13] fs/unionfs: Fix a memory leak & null pointer dereference Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 02/13] fs/unionfs/: Fix a memory leak in unionfs_read_super Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 03/13] fs/unionfs/: Don't grab dentry private data mutex in unionfs_d_release Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 04/13] fs/unionfs/: Several small cleanups in unionfs_interpose Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 05/13] fs/unionfs/: Rename unionfs_d_revalidate_wrap Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 06/13] fs/unionfs/: Remove alloc_filldir_node Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 07/13] fs/unionfs/: Use SEEK_{SET,CUR} instead of hardcoded values Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 08/13] fs/unionfs/: Check return value of d_path Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 09/13] fs/unionfs/: Miscellaneous coding style fixes Josef 'Jeff' Sipek
2007-03-05 2:16 ` Josef 'Jeff' Sipek [this message]
2007-03-05 2:16 ` [PATCH 11/13] fs/unionfs/: mntput in __cleanup_dentry Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 12/13] fs/unionfs/: Fix dentry leak in copyup_named_dentry Josef 'Jeff' Sipek
2007-03-05 2:16 ` [PATCH 13/13] fs/unionfs/: Fix unlocking in error paths Josef 'Jeff' Sipek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11730610183170-git-send-email-jsipek@cs.sunysb.edu \
--to=jsipek@cs.sunysb.edu \
--cc=ezk@cs.sunysb.edu \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).