diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2018-10-11 19:35:50 +0200 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2018-10-12 14:28:39 +0200 |
| commit | 3548fce1645bafbeb2256caaa3635a21bafd1621 (patch) | |
| tree | 38fa90bb1d04080382f3530cfd370e9197e49220 /fs | |
| parent | gfs2: Always check the result of gfs2_rbm_from_block (diff) | |
| download | linux-3548fce1645bafbeb2256caaa3635a21bafd1621.tar.xz linux-3548fce1645bafbeb2256caaa3635a21bafd1621.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/rgrp.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 7f8b562d1cbe..6eb2addcbff5 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -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; |