diff options
| author | Yuval Mintz | 2013-10-20 16:51:27 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-10-22 00:31:35 +0200 |
| commit | 1a6974b2c78755ae55d7be738866eb8d57c3ed45 (patch) | |
| tree | 5835074f923433306647acbca03f0a7087d288e4 /drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | |
| parent | bnx2x: Fix Maximum CoS estimation for VFs (diff) | |
| download | kernel-qcow2-linux-1a6974b2c78755ae55d7be738866eb8d57c3ed45.tar.gz kernel-qcow2-linux-1a6974b2c78755ae55d7be738866eb8d57c3ed45.tar.xz kernel-qcow2-linux-1a6974b2c78755ae55d7be738866eb8d57c3ed45.zip | |
bnx2x: Prevent an illegal pointer dereference during panic
During a panic, the driver tries to print the Management FW buffer of recent
commands. To do so, the driver reads the address of that buffer from a known
address. If the buffer is unavailable (e.g., PCI reads don't work, MCP is
failing, etc.), the driver will try to access the address it has read, possibly
causing a kernel panic.
This check 'sanitizes' the access, validating the read value is indeed a valid
address inside the management FW's buffers.
The patch also removes a read outside the scope of the buffer, which resulted
in some unrelated chraracters appearing in the log.
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index 97b3d32a98bd..d21742ca2fd2 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h @@ -2498,4 +2498,8 @@ enum bnx2x_pci_bus_speed { }; void bnx2x_set_local_cmng(struct bnx2x *bp); + +#define MCPR_SCRATCH_BASE(bp) \ + (CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH) + #endif /* bnx2x.h */ |