[gnumach] 01/02: git-physical-access.patch: Fix overflow brought by patch.

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository gnumach.

commit 2ff50949fb3cd2856483100279769291432a9086
Author: Samuel Thibault <address@hidden>
Date:   Sat Mar 22 15:05:58 2014 +0000

    git-physical-access.patch: Fix overflow brought by patch.
---
 debian/changelog                         |  6 ++++++
 debian/patches/git-physical-access.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e8e068e..24de22d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnumach (2:1.4-8) unstable; urgency=medium
+
+  * patches/git-physical-access.patch: Fix overflow brought by patch.
+
+ -- Samuel Thibault <address@hidden>  Sat, 22 Mar 2014 15:05:11 +0000
+
 gnumach (2:1.4-7) unstable; urgency=medium
 
   [ Samuel Thibault ]
diff --git a/debian/patches/git-physical-access.patch 
b/debian/patches/git-physical-access.patch
index 925bb17..73484a6 100644
--- a/debian/patches/git-physical-access.patch
+++ b/debian/patches/git-physical-access.patch
@@ -239,3 +239,29 @@ index 047a384..382cd5f 100644
  #if   NCPUS > 1
  /*
   *    List of cpus that are actively using mapped memory.  Any
+
+commit 7e59fbeb2f05e1400dadbbd2d9c93d8bd2ad8178
+Author: Samuel Thibault <address@hidden>
+Date:   Sat Mar 22 16:33:25 2014 +0100
+
+    Fix overflow
+    
+    We were filling much more than the mapwindows array, thus overwriting in
+    at least debugger variables.
+    
+    * i386/intel/pmap.c (pmap_bootstrap): Make sure to limit mapwindows
+    initialization within PMAP_NMAPWINDOWS.
+
+diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
+index a3d9630..4b2892a 100644
+--- a/i386/intel/pmap.c
++++ b/i386/intel/pmap.c
+@@ -780,7 +780,7 @@ void pmap_bootstrap(void)
+                       }
+                       for (; pte < ptable+NPTES; pte++)
+                       {
+-                              if (va >= kernel_virtual_end - PMAP_NMAPWINDOWS 
* PAGE_SIZE);
++                              if (va >= kernel_virtual_end - PMAP_NMAPWINDOWS 
* PAGE_SIZE && va < kernel_virtual_end)
+                               {
+                                       pmap_mapwindow_t *win = 
&mapwindows[atop(va - (kernel_virtual_end - PMAP_NMAPWINDOWS * PAGE_SIZE))];
+                                       win->entry = pte;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/gnumach.git