Subject: + ocfs2-fix-null-pointer-dereference-in-ocfs2_dir_foreach_blk_id-fix.patch added to -mm tree To: dan.carpenter@xxxxxxxxxx,jeff.liu@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxxx,viro@xxxxxxxxxxxxxxxxxx,wb@xxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 08 Aug 2013 14:56:44 -0700 The patch titled Subject: ocfs2: ocfs2: fix recent memory corruption bug has been added to the -mm tree. Its filename is ocfs2-fix-null-pointer-dereference-in-ocfs2_dir_foreach_blk_id-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-fix-null-pointer-dereference-in-ocfs2_dir_foreach_blk_id-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-fix-null-pointer-dereference-in-ocfs2_dir_foreach_blk_id-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ 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-fix.patch ocfs2-use-list_for_each_entry-instead-of-list_for_each.patch pktcdvd-convert-printk-to-pr_level.patch pktcdvd-fix-defective-misuses-of-pkt_level.patch linux-next.patch fs-convert-fs-shrinkers-to-new-scan-count-api-fix-fix.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