shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

ata: sata_mv: Fix incorrect string length computation in mv_dump_mem()

Browse Source 
[ Upstream commit e97eb65dd4 ]

snprintf() returns the "number of characters which *would* be generated for
the given input", not the size *really* generated.

In order to avoid too large values for 'o' (and potential negative values
for "sizeof(linebuf) o") use scnprintf() instead of snprintf().

Note that given the "w < 4" in the for loop, the buffer can NOT
overflow, but using the *right* function is always better.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET
2023-09-04 21:54:36 +02:00
committed by Greg Kroah-Hartman
parent 797d75bd57
commit dfbcef80dd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ata/sata_mv.c
View File

@@ -1255,8 +1255,8 @@ static void mv_dump_mem(struct device *dev, void __iomem *start, unsigned bytes)
for (b = 0; b < bytes; ) { for (b = 0; b < bytes; ) {
for (w = 0, o = 0; b < bytes && w < 4; w++) { for (w = 0, o = 0; b < bytes && w < 4; w++) {
o += snprintf(linebuf + o, sizeof(linebuf) - o, o += scnprintf(linebuf + o, sizeof(linebuf) - o,
"%08x ", readl(start + b)); "%08x ", readl(start + b));
b += sizeof(u32); b += sizeof(u32);
} }
dev_dbg(dev, "%s: %p: %s\n", dev_dbg(dev, "%s: %p: %s\n",