index b7a3b1e..e423d6f 100644

@@ -57,7 +57,12 @@ installdest: $(VS_BUILD_DIR)/nfsd.exe \

+	mkdir -p $(DESTDIR)/cygdrive/c/cygwin64/src/msnfs41client

@@ -70,15 +75,21 @@ installdest: $(VS_BUILD_DIR)/nfsd.exe \

+	@ printf "# Package sources and diffs\n"

@@ -86,6 +97,14 @@ installdest: $(VS_BUILD_DIR)/nfsd.exe \

@@ -94,6 +113,6 @@ cleandest:

+	rm -rvf "$(DESTDIR)"

diff --git a/cygwin/utils/mount_sshnfs/mount_sshnfs.ksh b/cygwin/utils/mount_sshnfs/mount_sshnfs.ksh

index 9b5c76e..4193d56 100755

--- a/cygwin/utils/mount_sshnfs/mount_sshnfs.ksh

+++ b/cygwin/utils/mount_sshnfs/mount_sshnfs.ksh

@@ -312,7 +312,7 @@ function cmd_mount

 	# fixme: Need better text layout for $ mount_sshnfs mount --man #

 	typeset -r mount_sshnfs_cmdmount_usage=$'+

-	[-?\n@(#)\$Id: mount_sshnfs mount (Roland Mainz) 2023-07-24 \$\n]

+	[-?\n@(#)\$Id: mount_sshnfs mount (Roland Mainz) 2023-12-08 \$\n]

 	[-author?Roland Mainz <roland.mainz@nrubsig.org>]

 	[+NAME?mount_sshnfs mount - mount NFSv4 filesystem through ssh

 		tunnel]

@@ -668,7 +668,7 @@ function cmd_umount

 	typeset mydebug=false # fixme: should be "bool" for ksh93v

 	# fixme: Need better text layout for $ mount_sshnfs mount --man #

 	typeset -r mount_sshnfs_cmdumount_usage=$'+

-	[-?\n@(#)\$Id: mount_sshnfs umount (Roland Mainz) 2023-07-24 \$\n]

+	[-?\n@(#)\$Id: mount_sshnfs umount (Roland Mainz) 2023-12-08 \$\n]

 	[-author?Roland Mainz <roland.mainz@nrubsig.org>]

 	[+NAME?mount_sshnfs umount - unmount NFSv4 filesystem mounted

 		via mount_sshnfs mount]

@@ -772,7 +772,7 @@ function main

 	# fixme: Need better text layout for $ mount_sshnfs --man #

 	typeset -r mount_sshnfs_usage=$'+

-	[-?\n@(#)\$Id: mount_sshnfs (Roland Mainz) 2023-07-24 \$\n]

+	[-?\n@(#)\$Id: mount_sshnfs (Roland Mainz) 2023-12-08 \$\n]

 	[-author?Roland Mainz <roland.mainz@nrubsig.org>]

 	[+NAME?mount_sshnfs - mount/umount NFSv4 filesystem via ssh

 		tunnel]

@@ -809,8 +809,8 @@ function main

 	if [[ "${ uname -o ;}" == 'Cygwin' ]] ; then

 		integer c.is_ccygwin=1

-		# only for testing!!

-		PATH+=':/cygdrive/c/Users/roland_mainz/Downloads/ms-nfs41-client-x64/ms-nfs41-client-x64/'

+		# Cygwin has nfs_mount.exe in /sbin

+		PATH+=':/sbin:/usr/sbin:/usr/bin:/bin'

 		typeset c.msnfsv41_nfsmountcmd="$(which 'nfs_mount.exe')"

diff --git a/daemon/getattr.c b/daemon/getattr.c

index 7c5f241..7621dba 100644

--- a/daemon/getattr.c

+++ b/daemon/getattr.c

@@ -59,8 +59,19 @@ int nfs41_cached_getattr(

 static int parse_getattr(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall)

 {

     int status;

+    EASSERT(length > 4);

+    if (length <= 4) {

+        status = ERROR_INVALID_PARAMETER;

+        goto out;

+    }

+    EASSERT(upcall->state_ref != NULL);

+    if (upcall->state_ref == NULL) {

+        status = ERROR_INVALID_PARAMETER;

+        goto out;

     getattr_upcall_args *args = &upcall->args.getattr;

-

     status = safe_read(&buffer, &length, &args->query_class, sizeof(args->query_class));

+#if 1

+    if (((char *)state->session) == ((char *)0xdddddddddddddddd)) {

+        eprintf("handle_getattr: Invalid session pointer 0xdddddddddddddddd\n");

+        status = ERROR_INVALID_PARAMETER;

+        goto out;

+    }

+    EASSERT(state->file.fh.superblock != NULL);

+    if (state->file.fh.superblock == NULL) {

+        /* gisburn: fixme: maybe this should be |ERROR_INTERNAL_ERROR| ? */

+        status = ERROR_INVALID_PARAMETER;

+        goto out;

+    }

+#endif

+

     status = nfs41_cached_getattr(state->session, &state->file, &info);

     if (status) {

         eprintf("nfs41_cached_getattr() failed with %d\n", status);

diff --git a/daemon/idmap_cygwin.c b/daemon/idmap_cygwin.c

index 64c1bff..f8bb74e 100644

--- a/daemon/idmap_cygwin.c

+++ b/daemon/idmap_cygwin.c

@@ -40,7 +40,7 @@

 #define CYGWIN_IDMAPPER_SCRIPT \

     ("C:\\cygwin64\\bin\\ksh93.exe " \

-    "/home/roland_mainz/work/msnfs41_uidmapping/ms-nfs41-client/cygwin_idmapper.ksh")

+    "/cygdrive/c/cygwin64/lib/msnfs41client/cygwin_idmapper.ksh")

 #ifdef NFS41_DRIVER_FEATURE_NAMESERVICE_CYGWIN

diff --git a/daemon/nfs41_daemon.c b/daemon/nfs41_daemon.c

index fe0683e..ecea1db 100644

--- a/daemon/nfs41_daemon.c

+++ b/daemon/nfs41_daemon.c

@@ -415,7 +415,21 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv)

 #ifdef _DEBUG

     /* dump memory leaks to stderr on exit; this requires the debug heap,

     /* available only when built in debug mode under visual studio -cbodley */

-    _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);

+

+    int crtsetdbgflags = 0;

+    crtsetdbgflags |= _CRTDBG_ALLOC_MEM_DF;  /* use debug heap */

+    crtsetdbgflags |= _CRTDBG_LEAK_CHECK_DF; /* report leaks on exit */

+#if 0

+    /*

+     * _CRTDBG_DELAY_FREE_MEM_DF - Delay freeing of memory, but fill

+     * memory blocks passed to |free()| with 0xdd. We rely on that to

+     * see 0xdddddddddddddddd-pointers for use-after-free and catch

+     * them in stress testing instead of having to deal with a core

+     * dump

+     */

+    crtsetdbgflags |= _CRTDBG_DELAY_FREE_MEM_DF;

diff --git a/daemon/nfs41_ops.c b/daemon/nfs41_ops.c

index bcca070..f2a4f22 100644

--- a/daemon/nfs41_ops.c

+++ b/daemon/nfs41_ops.c

@@ -400,6 +400,9 @@ int nfs41_open(

     bool_t already_delegated = delegation->type == OPEN_DELEGATE_READ

         || delegation->type == OPEN_DELEGATE_WRITE;

+    EASSERT(parent);

+    EASSERT(parent->fh.superblock);

+

     /* depending on the claim type, OPEN expects CURRENT_FH set

      * to either the parent directory, or to the file itself */

     switch (claim->claim) {

diff --git a/daemon/open.c b/daemon/open.c

index 8c01ac1..1cbac2c 100644

--- a/daemon/open.c

+++ b/daemon/open.c

@@ -99,6 +99,24 @@ static void open_state_free(

 void nfs41_open_state_ref(

     IN nfs41_open_state *state)

 {

+#if 1

+    /*

+     * gisburn: fixme: sometimes this happens under high parallel

+     * usage with multiple mounts - but why ?

+     * 0:038> kp

+     * Child-SP          RetAddr           Call Site

+     * 0000006d`431fde10 00007ff7`32f7d905 nfsd!nfs41_open_state_ref(struct __nfs41_open_state * state = 0x00000000`00000000)+0x31

+     * 0000006d`431fdf30 00007ff7`32f4d284 nfsd!upcall_parse(unsigned char * buffer = 0x0000006d`431fe180 "???", unsigned int length = 8, struct __nfs41_upcall * upcall = 0x0000006d`431ff1e0)+0x2e5

+     * 0000006d`431fe0b0 00007ffc`1ca24c7c nfsd!thread_main(void * args = 0x00007ff7`32fb6080)+0x144

+     * 0000006d`431ffe00 00007ffc`4d4b7344 ucrtbased!thread_start<unsigned int (void * parameter = 0x0000025d`a9c6def0)+0x9c

+     * 0000006d`431ffe60 00007ffc`4efc26b1 KERNEL32!BaseThreadInitThunk+0x14

+     * 0000006d`431ffe90 00000000`00000000 ntdll!RtlUserThreadStart+0x21

+     */

+    EASSERT(state != NULL);

+    if (state == NULL)

+        return;

+#endif

+

     const LONG count = InterlockedIncrement(&state->ref_count);

     dprintf(2, "nfs41_open_state_ref(%s) count %d\n", state->path.path, count);

diff --git a/daemon/upcall.c b/daemon/upcall.c

index bd13c61..7778429 100644

--- a/daemon/upcall.c

+++ b/daemon/upcall.c

@@ -121,6 +121,7 @@ int upcall_parse(

     /* parse the operation's arguments */

     op = g_upcall_op_table[upcall->opcode];

     if (op && op->parse) {

+        EASSERT(length > 0);

         status = op->parse(buffer, length, upcall);

         if (status) {

             eprintf("parsing of upcall '%s' failed with %d.\n",

diff --git a/sys/nfs41_build_features.h b/sys/nfs41_build_features.h

index 93ee7a9..d43334a 100644

--- a/sys/nfs41_build_features.h

+++ b/sys/nfs41_build_features.h

@@ -32,19 +32,19 @@

 /*

  * NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES - return local uid/gid values

  */

-// #define NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES 1

+#define NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES 1

 /*

  * NFS41_DRIVER_FEATURE_MAP_UNMAPPED_USER_TO_UNIXUSER_SID - give NFS

  * files which do not map to a local account a SID in the

  * Unix_User+x/Unix_Group+x range

  */

-// #define NFS41_DRIVER_FEATURE_MAP_UNMAPPED_USER_TO_UNIXUSER_SID 1

+#define NFS41_DRIVER_FEATURE_MAP_UNMAPPED_USER_TO_UNIXUSER_SID 1

 /*

  * NFS41_DRIVER_FEATURE_NAMESERVICE_CYGWIN - use Cygwin /usr/bin/getent

  * as "name service"

  */

-// #define NFS41_DRIVER_FEATURE_NAMESERVICE_CYGWIN 1

+#define NFS41_DRIVER_FEATURE_NAMESERVICE_CYGWIN 1

 #endif /* !_NFS41_DRIVER_BUILDFEATURES_ */

diff --git a/tests/winlocktest1/winlocktest1.ksh b/tests/winlocktest1/winlocktest1.ksh

old mode 100644

new mode 100755