Re: [PATCH 1/2] mmc: block: Preinitialize ret in mmc_blk_issue_drv_op()
From: Arnd Bergmann
Date: Wed Jul 05 2017 - 08:07:02 EST
On Wed, Jul 5, 2017 at 11:07 AM, Geert Uytterhoeven
> With gcc 4.1.2:
> drivers/mmc/core/block.c: In function âmmc_blk_issue_drv_opâ:
> drivers/mmc/core/block.c:1178: warning: âretâ may be used uninitialized in this function
> Indeed, if mq_rq->ioc_count is zero, an uninitialized value will be
> stored in mq_rq->drv_op_result and passed to blk_end_request_all().
> Can mq_rq->ioc_count be zero?
> - mmc_blk_ioctl_cmd() sets ioc_count to 1, so this is safe,
> - mmc_blk_ioctl_multi_cmd() obtains ioc_count from user space in
> response to the MMC_IOC_MULTI_CMD ioctl, and does allow zero.
> Preinitialize ret to -EINVAL to fix this for current and future callers.
> Fixes: 0493f6fe5bdee8ac ("mmc: block: Move boot partition locking into a driver op")
> Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> I assume -EINVAL is the error we want to return here if ioc_count is
> Or should it return success (zero), like mmc_blk_ioctl_multi_cmd() used
> to do?
I would suggest adding the initialization after "case MMC_DRV_OP_IOCTL:"
instead, to keep getting compile-time checks on the state of the 'ret'
variable. In that case, returning '0' is probably good.