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

sthibault pushed a commit to branch sid
in repository glibc.

commit 769ad5bbba7be68fbc0e5102f47aadf46a9f5784
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Tue Aug 30 23:09:31 2016 +0200

    hurd: New patch to fix crash on adjtime(..., NULL)
---
 debian/changelog                               |  7 +++++++
 debian/patches/hurd-i386/cvs-adjtime-NULL.diff | 29 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fd4119c..d6c85f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+glibc (2.23-6) UNRELEASED; urgency=medium
+
+  * patches/hurd-i386/cvs-adjtime-NULL.diff: New patch to fix crash on
+    adjtime(..., NULL).
+
+ -- Samuel Thibault <sthiba...@debian.org>  Tue, 30 Aug 2016 23:09:02 +0200
+
 glibc (2.23-5) unstable; urgency=medium
 
   * patches/hurd-i386/git-recvmsg.diff: New patch, fixes recvmsg on PF_LOCAL
diff --git a/debian/patches/hurd-i386/cvs-adjtime-NULL.diff 
b/debian/patches/hurd-i386/cvs-adjtime-NULL.diff
new file mode 100644
index 0000000..6a0c77b
--- /dev/null
+++ b/debian/patches/hurd-i386/cvs-adjtime-NULL.diff
@@ -0,0 +1,29 @@
+commit aaf30454802855d439f3d4d1a12fd6b905621029
+Author: Svante Signell <svante.sign...@gmail.com>
+Date:   Tue Aug 30 23:06:31 2016 +0200
+
+    hurd: Fix adjtime call with OLDDELTA == NULL
+    
+    * sysdeps/mach/hurd/adjtime.c (__adjtime): When OLDDELTA is NULL, make
+    it point to a dumb buffer for RPC to fill it.
+
+diff --git a/sysdeps/mach/hurd/adjtime.c b/sysdeps/mach/hurd/adjtime.c
+index d65b95b..7cfdd53 100644
+--- a/sysdeps/mach/hurd/adjtime.c
++++ b/sysdeps/mach/hurd/adjtime.c
+@@ -28,11 +28,15 @@ __adjtime (const struct timeval *delta, struct timeval 
*olddelta)
+ {
+   error_t err;
+   mach_port_t hostpriv;
++  struct timeval dummy;
+ 
+   err = __get_privileged_ports (&hostpriv, NULL);
+   if (err)
+     return __hurd_fail (EPERM);
+ 
++  if (olddelta == NULL)
++    olddelta = &dummy;
++
+   err = __host_adjust_time (hostpriv,
+                           /* `time_value_t' and `struct timeval' are in
+                                fact identical with the names changed.  */
diff --git a/debian/patches/series b/debian/patches/series
index e6ec157..d9855c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -155,6 +155,7 @@ hurd-i386/tg-eintr.diff
 hurd-i386/cvs-tabdly.diff
 hurd-i386/git-recvmsg.diff
 hurd-i386/tg-gsync-libc.diff
+hurd-i386/cvs-adjtime-NULL.diff
 
 i386/local-biarch.diff
 i386/local-cmov.diff

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

Reply via email to