Skip to content

Commit 5f2b28b

Browse files
vladimirolteankuba-moo
authored andcommitted
net: dsa: sja1105: fix kasan out-of-bounds warning in sja1105_table_delete_entry()
There are actually 2 problems: - deleting the last element doesn't require the memmove of elements [i + 1, end) over it. Actually, element i+1 is out of bounds. - The memmove itself should move size - i - 1 elements, because the last element is out of bounds. The out-of-bounds element still remains out of bounds after being accessed, so the problem is only that we touch it, not that it becomes in active use. But I suppose it can lead to issues if the out-of-bounds element is part of an unmapped page. Fixes: 6666ceb ("net: dsa: sja1105: Add support for VLAN operations") Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20250318115716.2124395-4-vladimir.oltean@nxp.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent b6a177b commit 5f2b28b

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/net/dsa/sja1105/sja1105_static_config.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,8 +1917,10 @@ int sja1105_table_delete_entry(struct sja1105_table *table, int i)
19171917
if (i > table->entry_count)
19181918
return -ERANGE;
19191919

1920-
memmove(entries + i * entry_size, entries + (i + 1) * entry_size,
1921-
(table->entry_count - i) * entry_size);
1920+
if (i + 1 < table->entry_count) {
1921+
memmove(entries + i * entry_size, entries + (i + 1) * entry_size,
1922+
(table->entry_count - i - 1) * entry_size);
1923+
}
19221924

19231925
table->entry_count--;
19241926

0 commit comments

Comments
 (0)