diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-12-27 16:51:11 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-12-27 16:53:20 +0000 |
| commit | 58acb23d278e82ffd9fe0f03fdfc8edd56e88809 (patch) | |
| tree | c57f4869793fd01ce2145325563274169b0a4451 /debian | |
| parent | ae240f746128da0984615f4dc25fe82a2b1ee25b (diff) | |
| parent | f8e898508b9f4326369a41c8411db2f3cfdbfaaa (diff) | |
Merge branch 'upstream-dfsg'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/20_zeromap.patch | 32 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 35 deletions
diff --git a/debian/changelog b/debian/changelog index 6a2bf79..5f3d2a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -gnumach (2:1.3.99.dfsg.git20120923-2) UNRELEASED; urgency=low +gnumach (2:1.3.99.dfsg.git20121227-1) unstable; urgency=low + * New upstream snapshot. * patches/20_zeromap.patch: New patch to fix abortion on mmap(size=0); - -- Samuel Thibault <sthibault@debian.org> Mon, 19 Nov 2012 16:57:00 +0100 + -- Samuel Thibault <sthibault@debian.org> Thu, 27 Dec 2012 16:52:39 +0000 gnumach (2:1.3.99.dfsg.git20120923-1) unstable; urgency=low diff --git a/debian/patches/20_zeromap.patch b/debian/patches/20_zeromap.patch deleted file mode 100644 index 7268448..0000000 --- a/debian/patches/20_zeromap.patch +++ /dev/null @@ -1,32 +0,0 @@ -As discussed on IRC already, the 'diff != 0' GNU Mach assertion failure -(vm/vm_map.c:1002), that came in with the recent allocator improvement -patch, is as easy as follows to reproduce: - - vm_map(mach_task_self(), 0, 0, 0, 1, 0, 0, 0, 0, 0, 0); - -Before that patch, GNU Mach accepted such a call and returnd 0 -- though -I did not check what effect it actually has. (And I don't think it has -any useful one.) I'm also reading that as of lately (Linux 2.6.12), mmap -with length = 0 is to return EINVAL; and mmap is, I think, the foremost -user of vm_map. - -Richard wants to address this problem, but in the mean time, I'm using -the following patch, which makes such a vm_map call return -KERN_INVALID_ARGUMENT, translated to EINVAL for mmap -(hurd/hurd.h:__hurd_fail). - ---- a/vm/vm_user.c~ 2012-11-19 13:02:18.000000000 +0100 -+++ b/vm/vm_user.c 2012-11-19 13:11:32.000000000 +0100 -@@ -342,6 +342,10 @@ kern_return_t vm_map( - return(KERN_INVALID_ARGUMENT); - } - -+ /* Avoid 'diff != 0' assertion failure later on. */ -+ if (size == 0) -+ return KERN_INVALID_ARGUMENT; -+ - *address = trunc_page(*address); - size = round_page(size); - - - diff --git a/debian/patches/series b/debian/patches/series index fa911f4..8433870 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ 00_clean_gfdl.patch 11_ignore_CSIn.patch 12_version_suffix.patch -20_zeromap.patch 50_initrd.patch 60_bigmem.patch 70_dde.patch |