[U-Boot] [Patch V2 1/3] dfu: mmc: check if mmc device exists in mmc_block_op()

Lukasz Majewski
2014-12-16T13:47:31Z

Hi Przemyslaw,

> The function mmc_block_op() is the last function before
> the physicall data write, but the mmc device pointer is not
> checked. If mmc device not exists, then data abort will occur.
> To avoid this, first the mmc device pointer is checked.
>
> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
> ---
> Change v2:
> - mmc_block_op(): change printf() to error()
> ---
> drivers/dfu/dfu_mmc.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
> index 72fa03e..62d72fe 100644
> --- a/drivers/dfu/dfu_mmc.c
> +++ b/drivers/dfu/dfu_mmc.c
> @@ -40,10 +40,16 @@ static int mmc_access_part(struct dfu_entity
> *dfu, struct mmc *mmc, int part) static int mmc_block_op(enum dfu_op
> op, struct dfu_entity *dfu, u64 offset, void *buf, long *len)
> {
> - struct mmc *mmc = find_mmc_device(dfu->data.mmc.dev_num);
> + struct mmc *mmc;
> u32 blk_start, blk_count, n = 0;
> int ret, part_num_bkp = 0;
>
> + mmc = find_mmc_device(dfu->data.mmc.dev_num);
> + if (!mmc) {
> + error("Device MMC %d - not found!",
> dfu->data.mmc.dev_num);
> + return -ENODEV;
> + }
> +
> /*
> * We must ensure that we work in lba_blk_size chunks, so
> ALIGN
> * this value.

Applied to u-boot-dfu, thanks!

--
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group