From: Andreas Hansson <andreas.hansson@arm.com>
Date: Fri, 24 Jan 2014 21:29:29 +0000 (-0600)
Subject: x86: Fix memory leak in table walker
X-Git-Tag: stable_2014_08_26~213
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f2b0b551cc02084dbabe0c14a2fd64dd85a3fbfc;p=gem5.git

x86: Fix memory leak in table walker

This patch fixes a memory leak in the table walker, by ensuring that
the sender state is deleted again if the request packet cannot be
successfully sent.
---

diff --git a/src/arch/x86/pagetable_walker.cc b/src/arch/x86/pagetable_walker.cc
index 45f902999..63397a607 100644
--- a/src/arch/x86/pagetable_walker.cc
+++ b/src/arch/x86/pagetable_walker.cc
@@ -165,8 +165,18 @@ Walker::recvRetry()
 
 bool Walker::sendTiming(WalkerState* sendingState, PacketPtr pkt)
 {
-    pkt->pushSenderState(new WalkerSenderState(sendingState));
-    return port.sendTimingReq(pkt);
+    WalkerSenderState* walker_state = new WalkerSenderState(sendingState);
+    pkt->pushSenderState(walker_state);
+    if (port.sendTimingReq(pkt)) {
+        return true;
+    } else {
+        // undo the adding of the sender state and delete it, as we
+        // will do it again the next time we attempt to send it
+        pkt->popSenderState();
+        delete walker_state;
+        return false;
+    }
+
 }
 
 BaseMasterPort &