Fix utimensat tests when not using compat code

5 files changed, 80 insertions, 5 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 46a4f4209..635786aca 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-7d50f9e5be88179325983a1f58c9d51bb58f025a
-7d50f9e5be88179325983a1f58c9d51bb58f025a
+bbc5ff0a295797174b4ef3928f58969e43f5adfe
+bbc5ff0a295797174b4ef3928f58969e43f5adfe
 102062f825fb26a74295a1c089c00c4c4c76b68a
 102062f825fb26a74295a1c089c00c4c4c76b68a
 openssh_8.0p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index c272f8fc8..9b6a47ba2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -121,6 +121,8 @@ openssh (1:8.0p1-1) UNRELEASED; urgency=medium
     - Enable gssapi-keyex authentication without gssapi-with-mic.
     - Allow querying for GSSAPI key exchange algorithms from ssh (-Q
       kex-gss).
+  * Apply upstream patch to fix the utimensat regression tests when not
+    using the compatibility implementation.
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 05 Jun 2019 07:09:47 +0100
 
diff --git a/debian/patches/fix-utimensat-test.patch b/debian/patches/fix-utimensat-test.patch
new file mode 100644
index 000000000..799337e64
--- /dev/null
+++ b/debian/patches/fix-utimensat-test.patch
@@ -0,0 +1,58 @@
+From bbc5ff0a295797174b4ef3928f58969e43f5adfe Mon Sep 17 00:00:00 2001
+From: Darren Tucker <dtucker@dtucker.net>
+Date: Fri, 7 Jun 2019 23:47:37 +1000
+Subject: Update utimensat test.
+
+POSIX specifies that when given a symlink, AT_SYMLINK_NOFOLLOW should
+update the symlink and not the destination.  The compat code doesn't
+have a way to do this, so where possible it fails instead of following a
+symlink when explicitly asked not to. Instead of checking for an explicit
+failure, check that it does not update the destination, which both the
+real and compat implementations should honour.
+
+Inspired by github pull req #125 from chutzpah at gentoo.org.
+
+Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=182898192d4b720e4faeafd5b39c2cfb3b92aa21
+Last-Update: 2019-06-09
+
+Patch-Name: fix-utimensat-test.patch
+---
+ openbsd-compat/regress/utimensattest.c | 20 +++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/openbsd-compat/regress/utimensattest.c b/openbsd-compat/regress/utimensattest.c
+index a7bc7634b..b29cef2f1 100644
+--- a/openbsd-compat/regress/utimensattest.c
++++ b/openbsd-compat/regress/utimensattest.c
+@@ -83,14 +83,28 @@ main(void)
+                fail("mtim.tv_nsec", 45678000, sb.st_mtim.tv_nsec);
+ #endif
+ 
++       /*
++        * POSIX specifies that when given a symlink, AT_SYMLINK_NOFOLLOW
++        * should update the symlink and not the destination.  The compat
++        * code doesn't have a way to do this, so where possible it fails
++        * with ENOSYS instead of following a symlink when explicitly asked
++        * not to.  Here we just test that it does not update the destination.
++        */
+        if (rename(TMPFILE, TMPFILE2) == -1)
+                fail("rename", 0, 0);
+        if (symlink(TMPFILE2, TMPFILE) == -1)
+                fail("symlink", 0, 0);
++       ts[0].tv_sec = 11223344;
++       ts[1].tv_sec = 55667788;
++       (void)utimensat(AT_FDCWD, TMPFILE, ts, AT_SYMLINK_NOFOLLOW);
++       if (stat(TMPFILE2, &sb) == -1)
++               fail("stat", 0, 0 );
++       if (sb.st_atime == 11223344)
++               fail("utimensat symlink st_atime", 0, 0 );
++       if (sb.st_mtime == 55667788)
++               fail("utimensat symlink st_mtime", 0, 0 );
+ 
+-       if (utimensat(AT_FDCWD, TMPFILE, ts, AT_SYMLINK_NOFOLLOW) != -1)
+-               fail("utimensat followed symlink", 0, 0);
+-
++       /* Clean up */
+        if (!(unlink(TMPFILE) == 0 && unlink(TMPFILE2) == 0))
+                fail("unlink", 0, 0);
+        exit(0);
diff --git a/debian/patches/series b/debian/patches/series
index 6304f537a..ba5a5ad4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ seccomp-s390-flock-ipc.patch
 seccomp-s390-ioctl-ep11-crypto.patch
 conch-old-privkey-format.patch
 revert-ipqos-defaults.patch
+fix-utimensat-test.patch
diff --git a/openbsd-compat/regress/utimensattest.c b/openbsd-compat/regress/utimensattest.c
index a7bc7634b..b29cef2f1 100644
--- a/openbsd-compat/regress/utimensattest.c
+++ b/openbsd-compat/regress/utimensattest.c
@@ -83,14 +83,28 @@ main(void)
                 fail("mtim.tv_nsec", 45678000, sb.st_mtim.tv_nsec);
 #endif
 
+        /*
+         * POSIX specifies that when given a symlink, AT_SYMLINK_NOFOLLOW
+         * should update the symlink and not the destination.  The compat
+         * code doesn't have a way to do this, so where possible it fails
+         * with ENOSYS instead of following a symlink when explicitly asked
+         * not to.  Here we just test that it does not update the destination.
+         */
         if (rename(TMPFILE, TMPFILE2) == -1)
                 fail("rename", 0, 0);
         if (symlink(TMPFILE2, TMPFILE) == -1)
                 fail("symlink", 0, 0);
+        ts[0].tv_sec = 11223344;
+        ts[1].tv_sec = 55667788;
+        (void)utimensat(AT_FDCWD, TMPFILE, ts, AT_SYMLINK_NOFOLLOW);
+        if (stat(TMPFILE2, &sb) == -1)
+                fail("stat", 0, 0 );
+        if (sb.st_atime == 11223344)
+                fail("utimensat symlink st_atime", 0, 0 );
+        if (sb.st_mtime == 55667788)
+                fail("utimensat symlink st_mtime", 0, 0 );
 
-        if (utimensat(AT_FDCWD, TMPFILE, ts, AT_SYMLINK_NOFOLLOW) != -1)
-                fail("utimensat followed symlink", 0, 0);
-
+        /* Clean up */
         if (!(unlink(TMPFILE) == 0 && unlink(TMPFILE2) == 0))
                 fail("unlink", 0, 0);
         exit(0);