diff options
| author | Borislav Petkov <borislav.petkov@amd.com> | 2009-12-21 15:15:59 +0100 |
|---|---|---|
| committer | Borislav Petkov <borislav.petkov@amd.com> | 2009-12-24 11:07:07 +0100 |
| commit | 8f68ed9728193b1f2fb53ba06031b06bd8b3d1b4 (patch) | |
| tree | 6418a0127d83f54c8ff4593c1be08952760450e9 | |
| parent | 603adaf6b3e37450235f0ddb5986b961b3146a79 (diff) | |
amd64_edac: fix driver instance freeing
Fix use-after-free errors by pushing all memory-freeing calls to the end
of amd64_remove_one_instance().
Reported-by: Darren Jenkins <darrenrjenkins@gmail.com>
LKML-Reference: <1261370306.11354.52.camel@ICE-BOX>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
| -rw-r--r-- | drivers/edac/amd64_edac.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 784cc5a1ebc3..fb0d36b47411 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -2929,16 +2929,15 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev) amd64_free_mc_sibling_devices(pvt); - kfree(pvt); - mci->pvt_info = NULL; - - mci_lookup[pvt->mc_node_id] = NULL; - /* unregister from EDAC MCE */ amd_report_gart_errors(false); amd_unregister_ecc_decoder(amd64_decode_bus_error); /* Free the EDAC CORE resources */ + mci->pvt_info = NULL; + mci_lookup[pvt->mc_node_id] = NULL; + + kfree(pvt); edac_mc_free(mci); } |