mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 20:02:17 +00:00
sky2: Fix crash inside sky2_rx_clean
If sky2->tx_le = pci_alloc_consistent() or sky2->tx_ring = kcalloc() in sky2_alloc_buffers() fails, sky2->rx_ring = kcalloc() will never be called. In this error case handling, sky2_rx_clean() is called from within sky2_free_buffers(). In sky2_rx_clean() we find the following: ... memset(sky2->rx_le, 0, RX_LE_BYTES); ... This results in a memset using a NULL pointer and will crash the system. Signed-off-by: Mirko Lindner <mlindner@marvell.com> Acked-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
92c7b0de6a
commit
799d2fff18
1 changed files with 3 additions and 1 deletions
|
@ -1361,7 +1361,9 @@ static void sky2_rx_clean(struct sky2_port *sky2)
|
|||
{
|
||||
unsigned i;
|
||||
|
||||
memset(sky2->rx_le, 0, RX_LE_BYTES);
|
||||
if (sky2->rx_le)
|
||||
memset(sky2->rx_le, 0, RX_LE_BYTES);
|
||||
|
||||
for (i = 0; i < sky2->rx_pending; i++) {
|
||||
struct rx_ring_info *re = sky2->rx_ring + i;
|
||||
|
||||
|
|
Loading…
Reference in a new issue