aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2009-12-21 09:15:59 -0500
committerBorislav Petkov <borislav.petkov@amd.com>2009-12-24 05:07:07 -0500
commit8f68ed9728193b1f2fb53ba06031b06bd8b3d1b4 (patch)
tree6418a0127d83f54c8ff4593c1be08952760450e9 /drivers/edac
parent603adaf6b3e37450235f0ddb5986b961b3146a79 (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>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/amd64_edac.c9
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)
2929 2929
2930 amd64_free_mc_sibling_devices(pvt); 2930 amd64_free_mc_sibling_devices(pvt);
2931 2931
2932 kfree(pvt);
2933 mci->pvt_info = NULL;
2934
2935 mci_lookup[pvt->mc_node_id] = NULL;
2936
2937 /* unregister from EDAC MCE */ 2932 /* unregister from EDAC MCE */
2938 amd_report_gart_errors(false); 2933 amd_report_gart_errors(false);
2939 amd_unregister_ecc_decoder(amd64_decode_bus_error); 2934 amd_unregister_ecc_decoder(amd64_decode_bus_error);
2940 2935
2941 /* Free the EDAC CORE resources */ 2936 /* Free the EDAC CORE resources */
2937 mci->pvt_info = NULL;
2938 mci_lookup[pvt->mc_node_id] = NULL;
2939
2940 kfree(pvt);
2942 edac_mc_free(mci); 2941 edac_mc_free(mci);
2943} 2942}
2944 2943