Skip to content

Commit

Permalink
GFS2: fix potential NULL pointer dereference
Browse files Browse the repository at this point in the history
Commit [e66cf16: GFS2: Use lockref for glocks] replaced call:
    atomic_read(&gi->gl->gl_ref) == 0
with:
    __lockref_is_dead(&gl->gl_lockref)
therefore changing how gl is accessed, from gi->gl to plan gl.
However, gl can be a NULL pointer, and so gi->gl needs to be
used instead (which is guaranteed not to be NULL because fo
the while loop checking that condition).

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  • Loading branch information
mina86 authored and swhiteho committed Nov 21, 2013
1 parent 527d151 commit e3c4269
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/gfs2/glock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1899,7 +1899,8 @@ static int gfs2_glock_iter_next(struct gfs2_glock_iter *gi)
gi->nhash = 0;
}
/* Skip entries for other sb and dead entries */
} while (gi->sdp != gi->gl->gl_sbd || __lockref_is_dead(&gl->gl_lockref));
} while (gi->sdp != gi->gl->gl_sbd ||
__lockref_is_dead(&gi->gl->gl_lockref));

return 0;
}
Expand Down

0 comments on commit e3c4269

Please sign in to comment.