Commit 91d9f809 authored by Maurizio Lombardi's avatar Maurizio Lombardi Committed by Christoph Hellwig

bnx2fc: fix memory leak and potential NULL pointer dereference.

If bnx2fc_allocate_hash_table() for some reasons fails, it is possible that the
hash_tbl_segments or the hash_tbl_pbl pointers are NULL.
In this case bnx2fc_free_hash_table() will panic the system.

this patch also fixes a memory leak, the hash_tbl_segments pointer was never
freed.
Signed-off-by: default avatarMaurizio Lombardi <mlombard@redhat.com>
Acked-by: default avatarEddie Wai <eddie.wai@broadcom.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent b044d149
...@@ -1968,21 +1968,27 @@ static void bnx2fc_free_hash_table(struct bnx2fc_hba *hba) ...@@ -1968,21 +1968,27 @@ static void bnx2fc_free_hash_table(struct bnx2fc_hba *hba)
int segment_count; int segment_count;
u32 *pbl; u32 *pbl;
segment_count = hba->hash_tbl_segment_count; if (hba->hash_tbl_segments) {
pbl = hba->hash_tbl_pbl; pbl = hba->hash_tbl_pbl;
for (i = 0; i < segment_count; ++i) { if (pbl) {
dma_addr_t dma_address; segment_count = hba->hash_tbl_segment_count;
for (i = 0; i < segment_count; ++i) {
dma_address = le32_to_cpu(*pbl); dma_addr_t dma_address;
++pbl;
dma_address += ((u64)le32_to_cpu(*pbl)) << 32; dma_address = le32_to_cpu(*pbl);
++pbl; ++pbl;
dma_free_coherent(&hba->pcidev->dev, dma_address += ((u64)le32_to_cpu(*pbl)) << 32;
BNX2FC_HASH_TBL_CHUNK_SIZE, ++pbl;
hba->hash_tbl_segments[i], dma_free_coherent(&hba->pcidev->dev,
dma_address); BNX2FC_HASH_TBL_CHUNK_SIZE,
hba->hash_tbl_segments[i],
dma_address);
}
}
kfree(hba->hash_tbl_segments);
hba->hash_tbl_segments = NULL;
} }
if (hba->hash_tbl_pbl) { if (hba->hash_tbl_pbl) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment