On Wed, 21 Nov 2018 at 00:10, Wolfram Sang <[email protected]> wrote: > > For RPMB, block count is a non-zero 16 bit wide number. Reject invalid > values from userspace instead of just masking the unneeded bits. Tested > with a modified 'mmc-utils' package. > > Signed-off-by: Wolfram Sang <[email protected]> Tested-by: Clément Péron <[email protected]> > --- > drivers/mmc/core/block.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index c35b5b08bb33..9e0f7e4aa8c6 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -550,6 +550,9 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, > struct mmc_blk_data *md, > } > > if (idata->rpmb) { > + if (data.blocks > 65535 || !data.blocks) > + return -EINVAL; > + > err = mmc_set_blockcount(card, data.blocks, > idata->ic.write_flag & (1 << 31)); > if (err) > -- > 2.11.0 >
- [RFC PATCH 0/3] mmc: refactor RPMB block count handling Wolfram Sang
- [RFC PATCH 3/3] mmc: core: remove obsolete mmc_set_bl... Wolfram Sang
- Re: [RFC PATCH 3/3] mmc: core: remove obsolete mm... Clément Péron
- [RFC PATCH 1/3] mmc: core: validate user input for RP... Wolfram Sang
- RE: [RFC PATCH 1/3] mmc: core: validate user inpu... Avri Altman
- Re: [RFC PATCH 1/3] mmc: core: validate user ... Wolfram Sang
- RE: [RFC PATCH 1/3] mmc: core: validate u... Avri Altman
- Re: [RFC PATCH 1/3] mmc: core: valid... Wolfram Sang
- Re: [RFC PATCH 1/3] mmc: core: validate user inpu... Clément Péron
- [RFC PATCH 2/3] mmc: core: use mrq->sbc when sendi... Wolfram Sang
- Re: [RFC PATCH 2/3] mmc: core: use mrq->sbc wh... Clément Péron
- Re: [RFC PATCH 0/3] mmc: refactor RPMB block count ha... Ulf Hansson
- Re: [RFC PATCH 0/3] mmc: refactor RPMB block coun... Wolfram Sang
- Re: [RFC PATCH 0/3] mmc: refactor RPMB block ... Clément Péron
- Re: [RFC PATCH 0/3] mmc: refactor RPMB bl... Clément Péron
- Re: [RFC PATCH 0/3] mmc: refactor RP... Wolfram Sang
- Re: [RFC PATCH 0/3] mmc: refacto... Clément Péron
- Re: [RFC PATCH 0/3] mmc: ref... Wolfram Sang
