]> git.baikalelectronics.ru Git - kernel.git/commit
gfs2: assign rgrp glock before compute_bitstructs
authorBob Peterson <rpeterso@redhat.com>
Mon, 17 Jan 2022 15:25:07 +0000 (10:25 -0500)
committerAndreas Gruenbacher <agruenba@redhat.com>
Tue, 15 Feb 2022 14:01:10 +0000 (15:01 +0100)
commit08639356e4a402cab900ff9370a213d865616898
treee68ffcee4b1df3b378463ed63785a37a72de9c14
parent61541caa89658fea194830baa7a6d9bd537331be
gfs2: assign rgrp glock before compute_bitstructs

Before this patch, function read_rindex_entry called compute_bitstructs
before it allocated a glock for the rgrp. But if compute_bitstructs found
a problem with the rgrp, it called gfs2_consist_rgrpd, and that called
gfs2_dump_glock for rgd->rd_gl which had not yet been assigned.

read_rindex_entry
   compute_bitstructs
      gfs2_consist_rgrpd
         gfs2_dump_glock <---------rgd->rd_gl was not set.

This patch changes read_rindex_entry so it assigns an rgrp glock before
calling compute_bitstructs so gfs2_dump_glock does not reference an
unassigned pointer. If an error is discovered, the glock must also be
put, so a new goto and label were added.

Reported-by: syzbot+c6fd14145e2f62ca0784@syzkaller.appspotmail.com
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
fs/gfs2/rgrp.c