pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patches for Cygwin package list+symlink fix, 2025-02-10
Posted by Anonymous on Mon 10th Feb 2025 13:06
raw | new post

  1. From 4961320c1f5e2a64761f3f7b2f24eb86b5658ab6 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Mon, 10 Feb 2025 09:58:21 +0100
  4. Subject: [PATCH 1/2] cygwin: Remove packages from "required" list which are
  5.  part of the Cygwin default installation
  6.  
  7. Remove packages from "required" list which are part of the
  8. Cygwin default installation.
  9.  
  10. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  11. ---
  12. cygwin/README.bintarball.txt | 50 ++++++++++++++++++++----------------
  13.  1 file changed, 28 insertions(+), 22 deletions(-)
  14.  
  15. diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt
  16. index 819a4c7..4c3ca12 100644
  17. --- a/cygwin/README.bintarball.txt
  18. +++ b/cygwin/README.bintarball.txt
  19. @@ -115,47 +115,53 @@ NFSv4.2/NFSv4.1 filesystem driver for Windows 10/11&Windows Server 2019
  20.  - Windows 10 (32bit or 64bit), Windows 11 or Windows Server 2019
  21.  - Cygwin:
  22.      - Cygwin versions:
  23. -        - 64bit: >= 3.5.3 (or 3.6.x-devel)
  24. +        - 64bit: >= 3.5.7 (or 3.6.x-devel)
  25.          - 32bit: >= 3.3.6
  26.      - Packages (required):
  27.          cygwin
  28. -        cygwin-devel
  29.          cygrunsrv
  30.          cygutils
  31.          cygutils-extra
  32. -        bash
  33. -        bzip2
  34. -        coreutils
  35. -        getent
  36. -        gdb
  37. -        grep
  38. -        hostname
  39. -        less
  40.          libiconv
  41.          libiconv2
  42. -        pax
  43. -        pbzip2
  44.          procps-ng
  45. -        sed
  46. -        tar
  47. -        time
  48.          util-linux
  49. -        wget
  50. -    - Packages (recommended):
  51. +
  52. +    - Packages (optional, recommended):
  53. +        bison
  54. +        cygport
  55. +        cygwin-devel
  56. +        clang
  57. +        dos2unix
  58. +        pax
  59. +        pbzip2
  60.          libnfs-utils (for /usr/bin/nfs-ls)
  61. +        libiconv-devel
  62.          make
  63.          bmake
  64.          git
  65.          gcc-core
  66.          gcc-g++
  67. -        clang
  68. +        gdb
  69.          mingw64-i686-clang
  70.          mingw64-x86_64-clang
  71. -        dos2unix
  72.          unzip
  73. -        bison
  74. -        cygport
  75. -        libiconv-devel
  76. +        time
  77. +
  78. +    - Packages (only-CI):
  79. +        # required packages, but part of Cygwin default installation
  80. +        # listed here for CI package list ONLY
  81. +        bash
  82. +        bzip2
  83. +        coreutils
  84. +        getent
  85. +        grep
  86. +        hostname
  87. +        less
  88. +        sed
  89. +        tar
  90. +        wget
  91. +
  92.  - MSYS2 (64bit, optional):
  93.      - Packages (recommended):
  94.          base-devel
  95. --
  96. 2.45.1
  97.  
  98. From f7989262758106e52411cab2f51eeede0b6691e3 Mon Sep 17 00:00:00 2001
  99. From: Roland Mainz <roland.mainz@nrubsig.org>
  100. Date: Mon, 10 Feb 2025 11:33:23 +0100
  101. Subject: [PATCH 2/2] daemon,include,sys: Make sure directories called "??" are
  102.  not handled as NT paths in symlinks
  103.  
  104. Make sure directories called "??" in a filesystems's root dir (i.e. "\??\")
  105. are not handled as NT paths in symlinks.
  106.  
  107. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  108. ---
  109. daemon/open.c            | 25 ++++++++++++++++---------
  110.  daemon/upcall.h          |  2 ++
  111.  include/nfs41_driver.h   | 14 ++++++++++++++
  112.  sys/nfs41sys_driver.h    |  1 +
  113.  sys/nfs41sys_openclose.c | 32 +++++++++++++++++---------------
  114.  5 files changed, 50 insertions(+), 24 deletions(-)
  115.  
  116. diff --git a/daemon/open.c b/daemon/open.c
  117. index ad7bb36..9440691 100644
  118. --- a/daemon/open.c
  119. +++ b/daemon/open.c
  120. @@ -608,7 +608,8 @@ static int create_with_ea(
  121.  
  122.  static
  123.  void symlink2ntpath(
  124. -    IN OUT nfs41_abs_path *restrict symlink)
  125. +    IN OUT nfs41_abs_path *restrict symlink,
  126. +    OUT nfs41_sysop_open_symlinktarget_type *out_target_type)
  127.  {
  128.      DPRINTF(1, ("--> symlink2ntpath(symlink='%.*s', len=%d)\n",
  129.          (int)symlink->len,
  130. @@ -643,6 +644,7 @@ void symlink2ntpath(
  131.              (int)symlink->len,
  132.              symlink->path,
  133.              (int)symlink->len));
  134. +        *out_target_type = NFS41_SYMLINKTARGET_NTPATH;
  135.      }
  136.      /* UNC path (e.g. "\\server\path") ? */
  137.      else if ((symlink->len > 3) &&
  138. @@ -662,27 +664,27 @@ void symlink2ntpath(
  139.              (int)symlink->len,
  140.              symlink->path,
  141.              (int)symlink->len));
  142. +        *out_target_type = NFS41_SYMLINKTARGET_NTPATH;
  143.      }
  144.      else {
  145.          /*
  146.           * All other paths just return a "drive abolute" path,
  147.           * e.g. \foo\bar
  148. -         *
  149. -         * FIXME/BUG: What about a directory called "??" in the
  150. -         * base of a filesystem, and access it with a trailing
  151. -         * slash in the symlink - that would result in "\??\",
  152. -         * which the kernel would treat as direct NT path...
  153.           */
  154.  
  155.          /* These asserts should never be triggered... */
  156.          EASSERT(symlink->len > 0);
  157.          EASSERT((symlink->len > 0) && (symlink->path[0] == '\\'));
  158. +        *out_target_type = NFS41_SYMLINKTARGET_FILESYSTEM_ABSOLUTE;
  159.      }
  160.  
  161. -    DPRINTF(1, ("<-- symlink2ntpath(symlink='%.*s', len=%d)\n",
  162. +    DPRINTF(1,
  163. +        ("<-- symlink2ntpath(symlink='%.*s', len=%d, "
  164. +            "*out_target_type=%d)\n",
  165.          (int)symlink->len,
  166.          symlink->path,
  167. -        (int)symlink->len));
  168. +        (int)symlink->len,
  169. +        (int)*out_target_type));
  170.  }
  171.  
  172.  static int handle_open(void *daemon_context, nfs41_upcall *upcall)
  173. @@ -759,6 +761,8 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall)
  174.              status = NO_ERROR;
  175.              upcall->last_error = ERROR_REPARSE;
  176.              args->symlink_embedded = TRUE;
  177. +            args->symlinktarget_type =
  178. +                NFS41_SYMLINKTARGET_FILESYSTEM_ABSOLUTE;
  179.          }
  180.          goto out_free_state;
  181.      }
  182. @@ -807,7 +811,7 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall)
  183.                      eprintf("nfs41_symlink_target() for '%s' failed with %d\n",
  184.                          args->path, status);
  185.                  } else {
  186. -                    symlink2ntpath(&args->symlink);
  187. +                    symlink2ntpath(&args->symlink, &args->symlinktarget_type);
  188.                      /* tell the driver to call RxPrepareToReparseSymbolicLink() */
  189.                      upcall->last_error = ERROR_REPARSE;
  190.                      args->symlink_embedded = FALSE;
  191. @@ -1224,6 +1228,9 @@ static int marshall_open(unsigned char *buffer, uint32_t *length, nfs41_upcall *
  192.          unsigned short len = (args->symlink.len + 1) * sizeof(WCHAR);
  193.          status = safe_write(&buffer, length, &args->symlink_embedded, sizeof(BOOLEAN));
  194.          if (status) goto out;
  195. +        BYTE tmp_symlinktarget_type = args->symlinktarget_type;
  196. +        status = safe_write(&buffer, length, &tmp_symlinktarget_type, sizeof(BYTE));
  197. +        if (status) goto out;
  198.          status = safe_write(&buffer, length, &len, sizeof(len));
  199.          if (status) goto out;
  200.          /* convert args->symlink to wchar */
  201. diff --git a/daemon/upcall.h b/daemon/upcall.h
  202. index 797d9d8..26878f1 100644
  203. --- a/daemon/upcall.h
  204. +++ b/daemon/upcall.h
  205. @@ -25,6 +25,7 @@
  206.  
  207.  #include "nfs41_build_features.h"
  208.  #include "nfs41_ops.h"
  209. +#include "nfs41_driver.h"
  210.  #include "from_kernel.h"
  211.  
  212.  #define NFSD_VERSION_MISMATCH 116
  213. @@ -66,6 +67,7 @@ typedef struct __open_upcall_args {
  214.      PFILE_FULL_EA_INFORMATION ea;
  215.      BOOLEAN created;
  216.      BOOLEAN symlink_embedded;
  217. +    nfs41_sysop_open_symlinktarget_type symlinktarget_type;
  218.  } open_upcall_args;
  219.  
  220.  typedef struct __close_upcall_args {
  221. diff --git a/include/nfs41_driver.h b/include/nfs41_driver.h
  222. index bddf5cc..13d880a 100644
  223. --- a/include/nfs41_driver.h
  224. +++ b/include/nfs41_driver.h
  225. @@ -86,6 +86,20 @@ typedef enum _nfs41_opcodes {
  226.      NFS41_SYSOP_INVALID_OPCODE1
  227.  } nfs41_opcodes;
  228.  
  229. +/*
  230. + * Symlink target path types returned by the |NFS41_SYSOP_OPEN|
  231. + * downcall
  232. + */
  233. +typedef enum _nfs41_sysop_open_symlinktarget_type {
  234. +    NFS41_SYMLINKTARGET_TYPE_UNDEFINED = 0,
  235. +    /*
  236. +     * Symlink within the same filesystem, but "absolute" from
  237. +     * mount root
  238. +     */
  239. +    NFS41_SYMLINKTARGET_FILESYSTEM_ABSOLUTE = 1,
  240. +    NFS41_SYMLINKTARGET_NTPATH = 2
  241. +} nfs41_sysop_open_symlinktarget_type;
  242. +
  243.  enum rpcsec_flavors {
  244.      RPCSEC_AUTH_SYS,
  245.      RPCSEC_AUTHGSS_KRB5,
  246. diff --git a/sys/nfs41sys_driver.h b/sys/nfs41sys_driver.h
  247. index 4b875ee..762e832 100644
  248. --- a/sys/nfs41sys_driver.h
  249. +++ b/sys/nfs41sys_driver.h
  250. @@ -228,6 +228,7 @@ typedef struct _updowncall_entry {
  251.              HANDLE srv_open;
  252.              DWORD deleg_type;
  253.              BOOLEAN symlink_embedded;
  254. +            nfs41_sysop_open_symlinktarget_type symlinktarget_type;
  255.              PMDL EaMdl;
  256.              PVOID EaBuffer;
  257.          } Open;
  258. diff --git a/sys/nfs41sys_openclose.c b/sys/nfs41sys_openclose.c
  259. index f28ede5..4d61e42 100644
  260. --- a/sys/nfs41sys_openclose.c
  261. +++ b/sys/nfs41sys_openclose.c
  262. @@ -288,6 +288,10 @@ NTSTATUS unmarshal_nfs41_open(
  263.      if (cur->errno == ERROR_REPARSE) {
  264.          RtlCopyMemory(&cur->u.Open.symlink_embedded, *buf, sizeof(BOOLEAN));
  265.          *buf += sizeof(BOOLEAN);
  266. +        BYTE tmp_symlinktarget_type;
  267. +        RtlCopyMemory(&tmp_symlinktarget_type, *buf, sizeof(BYTE));
  268. +        cur->u.Open.symlinktarget_type = tmp_symlinktarget_type;
  269. +        *buf += sizeof(BYTE);
  270.          RtlCopyMemory(&cur->u.Open.symlink.MaximumLength, *buf,
  271.              sizeof(USHORT));
  272.          *buf += sizeof(USHORT);
  273. @@ -735,19 +739,6 @@ retry_on_link:
  274.          UNICODE_STRING AbsPath;
  275.          PCHAR buf;
  276.          BOOLEAN ReparseRequired;
  277. -        /* symhasntpathprefix - symlink target has "\??\" prefix ? */
  278. -        BOOLEAN symhasntpathprefix;
  279. -
  280. -        if ((entry->u.Open.symlink.Length > (4*sizeof(wchar_t))) &&
  281. -            (!memcmp(entry->u.Open.symlink.Buffer,
  282. -                L"\\??\\", (4*sizeof(wchar_t))))) {
  283. -            symhasntpathprefix = TRUE;
  284. -            DbgP("symhasntpathprefix = TRUE\n");
  285. -        }
  286. -        else {
  287. -            symhasntpathprefix = FALSE;
  288. -            DbgP("symhasntpathprefix = TRUE\n");
  289. -        }
  290.  
  291.          /*
  292.           * Allocate the string for |RxPrepareToReparseSymbolicLink()|,
  293. @@ -757,10 +748,20 @@ retry_on_link:
  294.           * (which starts with "\??\", see above)
  295.           */
  296.          AbsPath.Length = 0;
  297. -        if (symhasntpathprefix == FALSE) {
  298. +        if (entry->u.Open.symlinktarget_type ==
  299. +            NFS41_SYMLINKTARGET_FILESYSTEM_ABSOLUTE) {
  300.              AbsPath.Length += DeviceObject->DeviceName.Length +
  301.                  VNetRootPrefix->Length;
  302.          }
  303. +        else if (entry->u.Open.symlinktarget_type ==
  304. +            NFS41_SYMLINKTARGET_NTPATH) {
  305. +        }
  306. +        else {
  307. +            DbgP("nfs41_Create: Unknown symlinktarget_type=%d\n",
  308. +                (int)entry->u.Open.symlinktarget_type);
  309. +            status = STATUS_INVALID_PARAMETER;
  310. +            goto out_free;
  311. +        }
  312.          AbsPath.Length += entry->u.Open.symlink.Length;
  313.          AbsPath.MaximumLength = AbsPath.Length + sizeof(UNICODE_NULL);
  314.          AbsPath.Buffer = RxAllocatePoolWithTag(NonPagedPoolNx,
  315. @@ -771,7 +772,8 @@ retry_on_link:
  316.          }
  317.  
  318.          buf = (PCHAR)AbsPath.Buffer;
  319. -        if (symhasntpathprefix == FALSE) {
  320. +        if (entry->u.Open.symlinktarget_type ==
  321. +            NFS41_SYMLINKTARGET_FILESYSTEM_ABSOLUTE) {
  322.              RtlCopyMemory(buf, DeviceObject->DeviceName.Buffer,
  323.                  DeviceObject->DeviceName.Length);
  324.              buf += DeviceObject->DeviceName.Length;
  325. --
  326. 2.45.1

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at