Subject: [folded-merged] ocfs2-fix-null-pointer-dereference-in-ocfs2_dir_foreach_blk_id-fix.patch removed from -mm tree
To: dan.carpenter@xxxxxxxxxx,jeff.liu@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxxx,viro@xxxxxxxxxxxxxxxxxx,wb@xxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 13 Aug 2013 15:57:50 -0700
The patch titled
Subject: ocfs2: ocfs2: fix recent memory corruption bug
has been removed from the -mm tree. Its filename was
ocfs2-fix-null-pointer-dereference-in-ocfs2_dir_foreach_blk_id-fix.patch
This patch was dropped because it was folded into ocfs2-fix-null-pointer-dereference-in-ocfs2_dir_foreach_blk_id.patch
------------------------------------------------------
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Subject: ocfs2: ocfs2: fix recent memory corruption bug
The pointer math in 6fdf3af1d2 "ocfs2: fix null pointer dereference in
ocfs2_dir_foreach_blk_id()" isn't correct so it will zero out the wrong
memory. In fact, the memset isn't needed because the initializer will set
all these values to zero.
This patch also removes the "ctx.pos = 0" initialization because that
will be zeroed automatically as well.
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Acked-by: Jie Liu <jeff.liu@xxxxxxxxxx>
Cc: David Weber <wb@xxxxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dir.c | 4 ----
1 file changed, 4 deletions(-)
diff -puN fs/ocfs2/dir.c~ocfs2-fix-null-pointer-dereference-in-ocfs2_dir_foreach_blk_id-fix fs/ocfs2/dir.c
--- a/fs/ocfs2/dir.c~ocfs2-fix-null-pointer-dereference-in-ocfs2_dir_foreach_blk_id-fix
+++ a/fs/ocfs2/dir.c
@@ -2154,12 +2154,8 @@ int ocfs2_empty_dir(struct inode *inode)
int ret;
struct ocfs2_empty_dir_priv priv = {
.ctx.actor = ocfs2_empty_dir_filldir,
- .ctx.pos = 0,
};
- memset(&priv + sizeof(struct dir_context), 0,
- sizeof(priv) - sizeof(struct dir_context));
-
if (ocfs2_dir_indexed(inode)) {
ret = ocfs2_empty_dir_dx(inode, &priv);
if (ret)
_
Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are
ocfs2-fix-null-pointer-dereference-in-ocfs2_dir_foreach_blk_id.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
