gfs2: fix potential NULL pointer dereference
PATCH 1/1 gfs2: fix potential NULL pointer dereference
From: Michal Nazarewicz <[email protected]>
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).
--- fs/gfs2/glock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/gfs2/glock.c +2 -1
@@ -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 ; }
Signature · 1 line
1.8.4.1
Hi,
Yes, good catch. Thanks, I'll add it to the tree,
Steve.
Quoted 30 lines · Michal Nazarewicz
From: Michal Nazarewicz <[email protected]>
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->glto plan gl. However, gl can be a NULL pointer, and sogi->glneeds to be used instead (which is guaranteed not to be NULL because fo the while loop checking that condition).Signed-off-by Michal Nazarewicz <[email protected]>--- fs/gfs2/glock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/gfs2/glock.c +2
-1@@ -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 ; }