diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2019-02-01 09:28:16 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-01 19:00:22 +0100 |
| commit | 294c149a209c6196c2de85f512b52ef50f519949 (patch) | |
| tree | bac41b5c5e67a0fd4cdde48757d9a71d3259f643 /drivers/net/ethernet/marvell/skge.c | |
| parent | bnxt_en: Disable interrupts when allocating CP rings or NQs. (diff) | |
| download | linux-294c149a209c6196c2de85f512b52ef50f519949.tar.xz linux-294c149a209c6196c2de85f512b52ef50f519949.zip | |
skge: potential memory corruption in skge_get_regs()
The "p" buffer is 0x4000 bytes long. B3_RI_WTO_R1 is 0x190. The value
of "regs->len" is in the 1-0x4000 range. The bug here is that
"regs->len - B3_RI_WTO_R1" can be a negative value which would lead to
memory corruption and an abrupt crash.
Fixes: c3f8be961808 ("[PATCH] skge: expand ethtool debug register dump")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/skge.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/skge.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c index 04fd1f135011..654ac534b10e 100644 --- a/drivers/net/ethernet/marvell/skge.c +++ b/drivers/net/ethernet/marvell/skge.c @@ -152,8 +152,10 @@ static void skge_get_regs(struct net_device *dev, struct ethtool_regs *regs, memset(p, 0, regs->len); memcpy_fromio(p, io, B3_RAM_ADDR); - memcpy_fromio(p + B3_RI_WTO_R1, io + B3_RI_WTO_R1, - regs->len - B3_RI_WTO_R1); + if (regs->len > B3_RI_WTO_R1) { + memcpy_fromio(p + B3_RI_WTO_R1, io + B3_RI_WTO_R1, + regs->len - B3_RI_WTO_R1); + } } /* Wake on Lan only supported on Yukon chips with rev 1 or above */ |