diff options
| author | Michal Nazarewicz <mina86@mina86.com> | 2013-11-12 16:30:05 +0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2013-11-21 13:55:45 +0400 |
| commit | e3c4269d139db7471ee560fb30948179e180b3d4 (patch) | |
| tree | 667d0743b7942e023b15b687714c3015fce2e868 | |
| parent | 527d1511310a89650000081869260394e20c7013 (diff) | |
| download | linux-e3c4269d139db7471ee560fb30948179e180b3d4.tar.xz | |
GFS2: fix potential NULL pointer dereference
Commit [e66cf1610: 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>
| -rw-r--r-- | fs/gfs2/glock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index e66a8009aff1..c8420f7e4db6 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -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; } |