mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-12-18 16:01:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

mmc: owl_mmc: Do not dereference data before NULL check

Browse Source 
In owl_mmc_prepare_data there is a NULL check for the pointer data but
it happens after data has already been dereferenced. Refactor the code
so that the NULL check happens before any code dereferences data.

This issue was found by Smatch.

Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org>
This commit is contained in:
Andrew Goodbody 2025-07-31 12:11:47 +01:00 committed by Tom Rini
parent e8fd262fb3
commit 6e382d8fc5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/mmc/owl_mmc.c
View File

@ -135,19 +135,19 @@ static void owl_mmc_prepare_data(struct owl_mmc_priv *priv,
setbits_le32(priv->reg_base + OWL_REG_SD_EN, OWL_SD_EN_BSEL);
writel(data->blocks, priv->reg_base + OWL_REG_SD_BLK_NUM);
writel(data->blocksize, priv->reg_base + OWL_REG_SD_BLK_SIZE);
total = data->blocksize * data->blocks;
if (total < 512)
writel(total, priv->reg_base + OWL_REG_SD_BUF_SIZE);
else
writel(512, priv->reg_base + OWL_REG_SD_BUF_SIZE);
/* DMA STOP */
writel(0x0, SD_DMA_CHANNEL(priv->dma_channel, 0) + DMA_START);
if (data) {
writel(data->blocks, priv->reg_base + OWL_REG_SD_BLK_NUM);
writel(data->blocksize, priv->reg_base + OWL_REG_SD_BLK_SIZE);
total = data->blocksize * data->blocks;
if (total < 512)
writel(total, priv->reg_base + OWL_REG_SD_BUF_SIZE);
else
writel(512, priv->reg_base + OWL_REG_SD_BUF_SIZE);
if (data->flags == MMC_DATA_READ) {
buf = (ulong) (data->dest);
owl_dma_config(priv, (ulong) priv->reg_base +