dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[PATCH] e1000: zero-out pointers in e1000_free_desc_rings 

In e1000_free_desc_rings, zero-out pointers after the memory they
point to is freed.  The test rings are static and get re-used, and
failures during subsequent test setups can cause e1000_free_desc_rings
to get called with dirty pointers.  Dirty pointers can cause oopses
or crashes...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville 2005-11-08 15:59:30 -05:00
parent e98fc4aae1
commit 6b27adb607
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/e1000/e1000_ethtool.c
View File

@ -960,13 +960,21 @@ e1000_free_desc_rings(struct e1000_adapter *adapter)
}
}
if(txdr->desc)
if(txdr->desc) {
pci_free_consistent(pdev, txdr->size, txdr->desc, txdr->dma);
if(rxdr->desc)
txdr->desc = NULL;
}
if(rxdr->desc) {
pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma);
rxdr->desc = NULL;
}
kfree(txdr->buffer_info);
txdr->buffer_info = NULL;
kfree(rxdr->buffer_info);
rxdr->buffer_info = NULL;
return;
}