| Message ID | 20130801140259.GA18952@elgon.mountain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/01/2013 10:02 PM, Dan Carpenter wrote: > 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. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > v2: remove the memset > > diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c > index c91d986..b1748cd 100644 > --- a/fs/ocfs2/dir.c > +++ b/fs/ocfs2/dir.c > @@ -2157,9 +2157,6 @@ int ocfs2_empty_dir(struct inode *inode) > .ctx.pos = 0, Umm, so above line could be removed as well. Thanks, -Jeff > }; > > - 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)
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index c91d986..b1748cd 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -2157,9 +2157,6 @@ int ocfs2_empty_dir(struct inode *inode) .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)
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. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- v2: remove the memset