redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

gfs2: Clean up out-of-bounds check in gfs2_rbm_from_block 

We already have a function that checks if a block is within a resource
group, so use that in gfs2_rbm_from_block as well.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Steven Whitehouse <swhiteho@redhat.com>
hifive-unleashed-5.1
Andreas Gruenbacher 2018-10-11 19:35:50 +02:00 committed by Bob Peterson
parent f654683dae
commit 3548fce164
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/gfs2/rgrp.c
View File

@ -273,15 +273,10 @@ static u32 gfs2_bitfit(const u8 *buf, const unsigned int len,
static int gfs2_rbm_from_block(struct gfs2_rbm *rbm, u64 block)
{
u64 rblock = block - rbm->rgd->rd_data0;
if (WARN_ON_ONCE(rblock > UINT_MAX))
return -EINVAL;
if (block >= rbm->rgd->rd_data0 + rbm->rgd->rd_data)
if (!rgrp_contains_block(rbm->rgd, block))
return -E2BIG;
rbm->bii = 0;
rbm->offset = (u32)(rblock);
rbm->offset = block - rbm->rgd->rd_data0;
/* Check if the block is within the first block */
if (rbm->offset < rbm_bi(rbm)->bi_blocks)
return 0;