Commit 3548fce1 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Bob Peterson

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: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Reviewed-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent f654683d
...@@ -273,15 +273,10 @@ static u32 gfs2_bitfit(const u8 *buf, const unsigned int len, ...@@ -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) static int gfs2_rbm_from_block(struct gfs2_rbm *rbm, u64 block)
{ {
u64 rblock = block - rbm->rgd->rd_data0; if (!rgrp_contains_block(rbm->rgd, block))
if (WARN_ON_ONCE(rblock > UINT_MAX))
return -EINVAL;
if (block >= rbm->rgd->rd_data0 + rbm->rgd->rd_data)
return -E2BIG; return -E2BIG;
rbm->bii = 0; rbm->bii = 0;
rbm->offset = (u32)(rblock); rbm->offset = block - rbm->rgd->rd_data0;
/* Check if the block is within the first block */ /* Check if the block is within the first block */
if (rbm->offset < rbm_bi(rbm)->bi_blocks) if (rbm->offset < rbm_bi(rbm)->bi_blocks)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment