Skip to content
Snippets Groups Projects
Commit 881942c7 authored by Jacob Keller's avatar Jacob Keller Committed by Greg Kroah-Hartman
Browse files

e100: fix length calculation in e100_get_regs_len


[ Upstream commit 4329c8dc ]

commit abf9b902 ("e100: cleanup unneeded math") tried to simplify
e100_get_regs_len and remove a double 'divide and then multiply'
calculation that the e100_reg_regs_len function did.

This change broke the size calculation entirely as it failed to account
for the fact that the numbered registers are actually 4 bytes wide and
not 1 byte. This resulted in a significant under allocation of the
register buffer used by e100_get_regs.

Fix this by properly multiplying the register count by u32 first before
adding the size of the dump buffer.

Fixes: abf9b902 ("e100: cleanup unneeded math")
Reported-by: default avatarFelicitas Hetzelt <felicitashetzelt@gmail.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d7e1cad0
Branches
Tags
No related merge requests found
......@@ -2466,7 +2466,11 @@ static void e100_get_drvinfo(struct net_device *netdev,
static int e100_get_regs_len(struct net_device *netdev)
{
struct nic *nic = netdev_priv(netdev);
return 1 + E100_PHY_REGS + sizeof(nic->mem->dump_buf);
/* We know the number of registers, and the size of the dump buffer.
* Calculate the total size in bytes.
*/
return (1 + E100_PHY_REGS) * sizeof(u32) + sizeof(nic->mem->dump_buf);
}
static void e100_get_regs(struct net_device *netdev,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment