diff options
| author |   Bob Peterson <rpeterso@redhat.com> | 2020-10-27 10:10:01 -0500 |
|---|---|---|
| committer |   Andreas Gruenbacher <agruenba@redhat.com> | 2020-10-29 22:16:36 +0100 |
| commit | d0f17d3883f1e3f085d38572c2ea8edbd5150172 (patch) | |
| tree | 97a986f49a518518cbf08e4e2907f743b088c727 /fs/gfs2/rgrp.c | |
| parent | scsi: qla2xxx: remove incorrect sparse #ifdef (diff) | |
| download | linux-dev-d0f17d3883f1e3f085d38572c2ea8edbd5150172.tar.xz linux-dev-d0f17d3883f1e3f085d38572c2ea8edbd5150172.zip | |
gfs2: Free rd_bits later in gfs2_clear_rgrpd to fix use-after-free
Function gfs2_clear_rgrpd calls kfree(rgd->rd_bits) before calling
return_all_reservations, but return_all_reservations still dereferences
rgd->rd_bits in __rs_deltree. Fix that by moving the call to kfree below the
call to return_all_reservations.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2/rgrp.c')
| -rw-r--r-- | fs/gfs2/rgrp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index ee491bb9c1cc..eb1b29734b7f 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -719,9 +719,9 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp) } gfs2_free_clones(rgd); + return_all_reservations(rgd); kfree(rgd->rd_bits); rgd->rd_bits = NULL; - return_all_reservations(rgd); kmem_cache_free(gfs2_rgrpd_cachep, rgd); } } |