linux-ext4 - [PATCH v2] NULL pointer when make_indexed

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <4DCC1FF8.6040103@linux.vnet.ibm.com>
Date:	Thu, 12 May 2011 10:59:20 -0700
From:	Allison Henderson <achender@...ux.vnet.ibm.com>
To:	Ext4 Developers List <linux-ext4@...r.kernel.org>
Subject: [PATCH v2] NULL pointer when make_indexed_dir returns -ENOSPC

Hi all,

I wasnt sure if people were expecting a v2 for this one, but I noticed 
the modified version of v1 was removed from the tree, so I am assuming 
we needed v2?  This one handles marking the buffer dirty before calling 
do split to avoid the null pointer.  It introduces a little overhead, 
but the only other option would be to introduce a new flag set to 
do_split.  But if there's any one that would prefer the flags to this 
solution, please let me know.  Thx! :)

Allison Henderson


Signed-off-by: Allison Henderson <achender@...ibm.com>

---
:100644 100644 3c7a06e... b754b77... M	fs/ext4/namei.c
  fs/ext4/namei.c |    6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 3c7a06e..b754b77 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1413,6 +1413,10 @@ static int make_indexed_dir(handle_t *handle, 
struct dentry *dentry,
  	frame->at = entries;
  	frame->bh = bh;
  	bh = bh2;
+
+	ext4_handle_dirty_metadata(handle, dir, frame->bh);
+	ext4_handle_dirty_metadata(handle, dir, bh);
+
  	de = do_split(handle,dir, &bh, frame, &hinfo, &retval);
  	if (!de) {
  		/*
@@ -1421,8 +1425,6 @@ static int make_indexed_dir(handle_t *handle, 
struct dentry *dentry,
  		 * with corrupted filesystem.
  		 */
  		ext4_mark_inode_dirty(handle, dir);
-		ext4_handle_dirty_metadata(handle, dir, frame->bh);
-		ext4_handle_dirty_metadata(handle, dir, bh);
  		dx_release(frames);
  		return retval;
  	}
-- 
1.7.1

--
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