Commit 65b0e307 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Linus Walleij

ARM: ux500: do not directly dereference __iomem

Sparse reports that calling add_device_randomness() on `uid` is a
violation of address spaces. And indeed the next usage uses readl()
properly, but that was left out when passing it toadd_device_
randomness(). So instead copy the whole thing to the stack first.

Fixes: 4040d10a ("ARM: ux500: add DB serial number to entropy pool")
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/all/202210230819.loF90KDh-lkp@intel.com/Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Link: https://lore.kernel.org/r/20221108123755.207438-1-Jason@zx2c4.comSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b29ea0e7
...@@ -167,20 +167,18 @@ ATTRIBUTE_GROUPS(ux500_soc); ...@@ -167,20 +167,18 @@ ATTRIBUTE_GROUPS(ux500_soc);
static const char *db8500_read_soc_id(struct device_node *backupram) static const char *db8500_read_soc_id(struct device_node *backupram)
{ {
void __iomem *base; void __iomem *base;
void __iomem *uid;
const char *retstr; const char *retstr;
u32 uid[5];
base = of_iomap(backupram, 0); base = of_iomap(backupram, 0);
if (!base) if (!base)
return NULL; return NULL;
uid = base + 0x1fc0; memcpy_fromio(uid, base + 0x1fc0, sizeof(uid));
/* Throw these device-specific numbers into the entropy pool */ /* Throw these device-specific numbers into the entropy pool */
add_device_randomness(uid, 0x14); add_device_randomness(uid, sizeof(uid));
retstr = kasprintf(GFP_KERNEL, "%08x%08x%08x%08x%08x", retstr = kasprintf(GFP_KERNEL, "%08x%08x%08x%08x%08x",
readl((u32 *)uid+0), uid[0], uid[1], uid[2], uid[3], uid[4]);
readl((u32 *)uid+1), readl((u32 *)uid+2),
readl((u32 *)uid+3), readl((u32 *)uid+4));
iounmap(base); iounmap(base);
return retstr; return retstr;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment