Home
My Posts

Archive
Login
Signup

Recent Posts

Free subdomains

Want your own xyz.kpaste.net sub-domain for your community? Just type the address into your browser address bar (foo.xyz.kpaste.net is also supported).

Suggestions/Bugs?

Email us at . Try to include as much info as possible.

About

Pastebin is a tool for collaborative debugging or editing.

 

msnfs41client: Patch for readdir issues, long paths and misc compiler warning/flags stuff, 2023-12-29
Posted by Anonymous on Fri 29th Dec 2023 06:15
raw | new post

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: None Bash C C++ CSS Diff HTML mIRC Script Perl PHP Python Smarty XML ---------------------------- ABAP Actionscript ADA Apache Log AppleScript APT sources.list ASM ASP AutoIT Bash C C# C++ C++ (with QT) CSS Diff HTML INI (Config Files) Java Javascript Lua Make mIRC Script MySQL NSIS Perl PHP Python Q(uick)BASIC robots Ruby Ruby on Rails SDLBasic Smarty SQL TCL Text VB.NET Visual BASIC Visual Fox Pro Visual Prolog Windows Registry Files XML Xorg.conf

To highlight particular lines, prefix each line with {%HIGHLIGHT}
From ae406887a2c2897ecc3f038c44f592a41730d542 Mon Sep 17 00:00:00 2001 From: Martin Wege <martin.l.wege@gmail.com> Date: Thu, 28 Dec 2023 05:19:21 +0100 Subject: [PATCH 1/5] daemon/readdir.c does not support all pattern required by NtQueryDirectoryFile() daemon/readdir.c does not support all filter filename pattern required by NtQueryDirectoryFile(), e.g. '<', '>', '"', '*' and '?'. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/readdir.c | 257 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 220 insertions(+), 37 deletions(-) diff --git a/daemon/readdir.c b/daemon/readdir.c index 431adde..66e117c 100644 --- a/daemon/readdir.c +++ b/daemon/readdir.c @@ -22,6 +22,9 @@ #include <Windows.h> #include <strsafe.h> #include <stdlib.h> +#include <stdbool.h> +#include <string.h> +#include <stdio.h> #include "from_kernel.h" #include "nfs41_ops.h" #include "daemon_debug.h" @@ -29,6 +32,214 @@ #include "util.h" +/* + * Handle filename pattern for NtQueryDirectoryFile() + */ + +/* + * See + * https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/ntifs/nf-ntifs-_fsrtl_advanced_fcb_header-fsrtlisdbcsinexpression + * for a description of the pattern syntax + */ +#define FILTER_STAR ('<') +#define FILTER_QM ('>') +#define FILTER_DOT ('"') + +bool +readdir_filter(const char *filter, const char *name) +{ +#define MAX_NUM_BACKTRACKING (256) + const size_t filter_len = strlen(filter); + const size_t name_len = strlen(name); + size_t foff; + size_t pos; + const int bt_buf_size = MAX_NUM_BACKTRACKING; + size_t bt_buf[MAX_NUM_BACKTRACKING], old_bt_buf[MAX_NUM_BACKTRACKING] = { 0 }; + size_t *bt = bt_buf, *old_bt = old_bt_buf; + size_t bt_pos, old_bt_pos; + size_t filter_pos, name_pos = 0, matching_chars = 1; + int n_ch = 0, f_ch; + bool endofnamebuf = false; + bool res; + bool donotskipdot; + + if ((filter_len == 0) || (name_len == 0)) + { + if ((name_len == 0) && (filter_len == 0)) + return true; + + return false; + } + + if ((filter_len == 1) && (filter[0] == '*')) + return true; + + for (; !endofnamebuf; matching_chars = bt_pos) + { + old_bt_pos = bt_pos = 0; + + if (name_pos >= name_len) + { + endofnamebuf = true; + if (matching_chars && (old_bt[matching_chars - 1] == (filter_len * 2))) + break; + } + else + { + n_ch = name[name_pos]; + name_pos++; + } + + while (matching_chars > old_bt_pos) + { + filter_pos = (old_bt[old_bt_pos++] + 1) / 2; + + for (foff = 0; filter_pos < filter_len; ) + { + filter_pos += foff; + + if (filter_pos == filter_len) + { + bt[bt_pos++] = filter_len * 2; + break; + } + + /* backtracking buffer too small ? */ + if (bt_pos > (bt_buf_size - 3)) + { + (void)fprintf(stderr, + "ASSERT: bt buffer too small: bt_buf_size=%x\n", + (int)bt_buf_size); + res = false; + goto done; + } + + f_ch = filter[filter_pos]; + foff = 1; + + if ((f_ch == n_ch) && !endofnamebuf) + { + bt[bt_pos++] = (filter_pos + foff) * 2; + } + else if ((f_ch == '?') && !endofnamebuf) + { + bt[bt_pos++] = (filter_pos + foff) * 2; + } + else if (f_ch == '*') + { + bt[bt_pos++] = filter_pos * 2; + bt[bt_pos++] = (filter_pos * 2) + 1; + continue; + } + else if (f_ch == FILTER_STAR) + { + donotskipdot = true; + if (!endofnamebuf && (n_ch == '.')) + { + for (pos = name_pos; pos < name_len; pos++) + { + if (name[pos] == '.') + { + donotskipdot = false; + break; + } + } + } + + if (endofnamebuf || (n_ch != '.') || !donotskipdot) + bt[bt_pos++] = filter_pos * 2; + + bt[bt_pos++] = (filter_pos * 2) + 1; + continue; + } + else if (f_ch == FILTER_QM) + { + if (endofnamebuf || (n_ch == '.')) + continue; + + bt[bt_pos++] = (filter_pos + foff) * 2; + } + else if (f_ch == FILTER_DOT) + { + if (endofnamebuf) + continue; + + if (n_ch == '.') + bt[bt_pos++] = (filter_pos + foff) * 2; + } + + break; + } + + for (pos = 0; (matching_chars > old_bt_pos) && (pos < bt_pos); pos++) + { + while ((matching_chars > old_bt_pos) && (bt[pos] > old_bt[old_bt_pos])) + { + old_bt_pos++; + } + } + } + + size_t *bt_swap; + bt_swap = bt; + bt = old_bt; + old_bt = bt_swap; + } + + res = matching_chars && (old_bt[matching_chars - 1] == (filter_len * 2)); + +done: + return res; +} + +#ifdef TEST_FILTER +static +void test_filter(const char *filter, const char *name, int expected_res) +{ + int res; + res = filter_name(filter, name); + + (void)printf("filter_name(filter='%s',\tname='%s')\t = %s - \t%s\n", + filter, name, res?"true":"false", ((expected_res==res)?"OK":"FAIL")); +} + +int main(int ac, char *av[]) +{ + test_filter("foo", "foo", 1); + test_filter("foo", "", 0); + test_filter("", "foo", 0); + test_filter("", "", 1); + test_filter("f*?", "foo", 1); + test_filter("f??", "foo", 1); + test_filter("f?x", "foo", 0); + test_filter("f*", "foo", 1); + test_filter("f<", "foo", 1); + test_filter("x*", "foo", 0); + test_filter("x<", "foo", 0); + test_filter("*o", "foo", 1); + test_filter("<o", "foo", 1); + test_filter("f*oo", "foo", 1); + test_filter("f\"o", "f.o", 1); + test_filter("f***********oo", "foo", 1); + test_filter("f<<<<<<<<<<<oo", "foo", 1); + test_filter("f<*<*<*<?<*<o", "foo", 1); + test_filter("f<*<*<*<?<*<", "foo", 1); + test_filter("<*<*<*<?<*<", "foo", 1); + test_filter("CL.write\"<.tlog", "CL.write.foo.bar.tlog", 1); + test_filter("CL.write\"foo<.tlog", "CL.write.foo.bar.tlog", 1); + test_filter("CL.write\">>><.tlog", "CL.write.foo.bar.tlog", 1); + test_filter("<.tlog", "bar.tlog", 1); + test_filter(">.tlog", "a.tlog", 1); + test_filter(">.tlog", "ab.tlog", 0); + test_filter(">>.tlog", "ab.tlog", 1); + test_filter(">*.tlog", "ab.tlog", 1); + test_filter("*>*.tlog", "ab.tlog", 1); + test_filter(">?.tlog", "ab.tlog", 1); + return 0; +} +#endif /* TEST_FILTER */ + + typedef union _FILE_DIR_INFO_UNION { ULONG NextEntryOffset; FILE_NAMES_INFORMATION fni; @@ -71,38 +282,6 @@ out: return status; } -#define FILTER_STAR '*' -#define FILTER_QM '>' - -static __inline const char* skip_stars( - const char *filter) -{ - while (*filter == FILTER_STAR) - filter++; - return filter; -} - -static int readdir_filter( - const char *filter, - const char *name) -{ - const char *f = filter, *n = name; - - while (*f && *n) { - if (*f == FILTER_STAR) { - f = skip_stars(f); - if (*f == '\0') - return 1; - while (*n && !readdir_filter(f, n)) - n++; - } else if (*f == FILTER_QM || *f == *n) { - f++; - n++; - } else - return 0; - } - return *f == *n || *skip_stars(f) == '\0'; -} static uint32_t readdir_size_for_entry( IN int query_class, @@ -381,7 +560,7 @@ static int readdir_add_dots( case 0: if (entry_buf_len < entry_len + 2) { status = ERROR_BUFFER_OVERFLOW; - dprintf(1, "not enough room for '.' entry. received %d need %d\n", + dprintf(0, "readdir_add_dots: not enough room for '.' entry. received %d need %d\n", entry_buf_len, entry_len + 2); args->query_reply_len = entry_len + 2; goto out; @@ -393,7 +572,7 @@ static int readdir_add_dots( status = nfs41_cached_getattr(state->session, &state->file, &entry->attr_info); if (status) { - dprintf(1, "failed to add '.' entry.\n"); + dprintf(0, "readdir_add_dots: failed to add '.' entry.\n"); goto out; } entry->cookie = COOKIE_DOT; @@ -411,7 +590,7 @@ static int readdir_add_dots( case COOKIE_DOT: if (entry_buf_len < entry_len + 3) { status = ERROR_BUFFER_OVERFLOW; - dprintf(1, "not enough room for '..' entry. received %d need %d\n", + dprintf(0, "readdir_add_dots: not enough room for '..' entry. received %d need %d\n", entry_buf_len, entry_len); args->query_reply_len = entry_len + 2; goto out; @@ -427,7 +606,7 @@ static int readdir_add_dots( &state->parent, &entry->attr_info); if (status) { status = ERROR_FILE_NOT_FOUND; - dprintf(1, "failed to add '..' entry.\n"); + dprintf(0, "readdir_add_dots: failed to add '..' entry.\n"); goto out; } entry->cookie = COOKIE_DOTDOT; @@ -493,7 +672,11 @@ fetch_entries: nfs41_superblock_getattr_mask(state->file.fh.superblock, &attr_request); attr_request.arr[0] |= FATTR4_WORD0_RDATTR_ERROR; - if (strchr(args->filter, FILTER_STAR) || strchr(args->filter, FILTER_QM)) { + if (strchr(args->filter, FILTER_STAR) || + strchr(args->filter, FILTER_QM) || + strchr(args->filter, FILTER_DOT) || + strchr(args->filter, '?') || + strchr(args->filter, '*')) { /* use READDIR for wildcards */ uint32_t dots_len = 0; -- 2.42.1 From 4481e4eecb8fa1b9a6eb27371514c401a715508d Mon Sep 17 00:00:00 2001 From: Martin Wege <martin.l.wege@gmail.com> Date: Fri, 29 Dec 2023 02:16:13 +0100 Subject: [PATCH 2/5] Fix VC19 "Arithmetic overflow" warnings Fix Visual Studio 19's "Arithmetic overflow" warnings generated by MSBuild.exe 'ms-nfs41-client\build.vc19\nfs41-client.sln' -t:Build /p:RunCodeAnalysis=true -p:Configuration=Debug -p:Platform=x64 Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/ea.c | 4 ++-- daemon/nfs41_xdr.c | 4 ++-- daemon/readdir.c | 9 ++++----- daemon/util.c | 2 +- libtirpc/src/auth_sspi.c | 2 +- libtirpc/src/getnetconfig.c | 4 ++-- libtirpc/src/rpc_callmsg.c | 2 +- libtirpc/src/svc_dg.c | 6 +++--- libtirpc/src/xdr_rec.c | 6 +++--- 9 files changed, 19 insertions(+), 20 deletions(-) diff --git a/daemon/ea.c b/daemon/ea.c index ac8707c..55643da 100644 --- a/daemon/ea.c +++ b/daemon/ea.c @@ -269,7 +269,7 @@ static int read_entire_dir( if (len < READDIR_LEN_MIN) { const ptrdiff_t diff = (unsigned char*)last_entry - buffer; /* realloc the buffer to fit more entries */ - unsigned char *tmp = realloc(buffer, buffer_len * 2); + unsigned char *tmp = realloc(buffer, (size_t)buffer_len * 2L); if (tmp == NULL) { status = GetLastError(); goto out_free; @@ -605,7 +605,7 @@ static int handle_getexattr(void *daemon_context, nfs41_upcall *upcall) } ea->EaNameLength = query->EaNameLength; - StringCchCopy(ea->EaName, ea->EaNameLength + 1, query->EaName); + StringCchCopy(ea->EaName, (size_t)ea->EaNameLength + 1, query->EaName); ea->Flags = 0; /* read the value from file */ diff --git a/daemon/nfs41_xdr.c b/daemon/nfs41_xdr.c index 4252785..56bfcb8 100644 --- a/daemon/nfs41_xdr.c +++ b/daemon/nfs41_xdr.c @@ -2078,7 +2078,7 @@ static bool_t decode_modified_limit4( if (!xdr_u_int32_t(xdr, &bytes_per_block)) return FALSE; - *filesize = blocks * bytes_per_block; + *filesize = (uint64_t)blocks * bytes_per_block; return TRUE; } @@ -2346,7 +2346,7 @@ static bool_t decode_readdir_entry( entry->attr_info.rdattr_error = NFS4ERR_BADXDR; StringCchCopyA(entry->name, name_len, (STRSAFE_LPCSTR)name); - it->buf_pos += entry_len + name_len; + it->buf_pos += (size_t)entry_len + name_len; it->remaining_len -= entry_len + name_len; it->last_entry_offset = &entry->next_entry_offset; } diff --git a/daemon/readdir.c b/daemon/readdir.c index 66e117c..5cbe66c 100644 --- a/daemon/readdir.c +++ b/daemon/readdir.c @@ -48,12 +48,11 @@ bool readdir_filter(const char *filter, const char *name) { -#define MAX_NUM_BACKTRACKING (256) +#define MAX_NUM_BACKTRACKING (256L) const size_t filter_len = strlen(filter); const size_t name_len = strlen(name); size_t foff; size_t pos; - const int bt_buf_size = MAX_NUM_BACKTRACKING; size_t bt_buf[MAX_NUM_BACKTRACKING], old_bt_buf[MAX_NUM_BACKTRACKING] = { 0 }; size_t *bt = bt_buf, *old_bt = old_bt_buf; size_t bt_pos, old_bt_pos; @@ -105,11 +104,11 @@ readdir_filter(const char *filter, const char *name) } /* backtracking buffer too small ? */ - if (bt_pos > (bt_buf_size - 3)) + if (bt_pos > (MAX_NUM_BACKTRACKING - 3L)) { (void)fprintf(stderr, - "ASSERT: bt buffer too small: bt_buf_size=%x\n", - (int)bt_buf_size); + "ASSERT: bt buffer too small: MAX_NUM_BACKTRACKING=%x\n", + (int)MAX_NUM_BACKTRACKING); res = false; goto done; } diff --git a/daemon/util.c b/daemon/util.c index da309b2..27b0be0 100644 --- a/daemon/util.c +++ b/daemon/util.c @@ -444,7 +444,7 @@ int create_silly_rename( tmp = (char*)silly->name; StringCchPrintf(tmp, end - tmp, ".%s.", name); - tmp += silly->len + 2; + tmp += (size_t)silly->len + 2L; for (i = 0; i < 16; i++, tmp++) StringCchPrintf(tmp, end - tmp, "%x", fhmd5[i]); diff --git a/libtirpc/src/auth_sspi.c b/libtirpc/src/auth_sspi.c index 546a86d..78dc6ba 100644 --- a/libtirpc/src/auth_sspi.c +++ b/libtirpc/src/auth_sspi.c @@ -720,7 +720,7 @@ void sspi_release_buffer(sspi_buffer_desc *buf) uint32_t sspi_import_name(sspi_buffer_desc *name_in, sspi_name_t *name_out) { - *name_out = calloc(name_in->length + 5, sizeof(char)); + *name_out = calloc((size_t)name_in->length + 5L, sizeof(char)); if (*name_out == NULL) return SEC_E_INSUFFICIENT_MEMORY; diff --git a/libtirpc/src/getnetconfig.c b/libtirpc/src/getnetconfig.c index 0330d86..2e847f9 100644 --- a/libtirpc/src/getnetconfig.c +++ b/libtirpc/src/getnetconfig.c @@ -605,7 +605,7 @@ struct netconfig *ncp; /* where to put results */ tokenp = _get_next_token(cp, ','); ncp->nc_lookups[(size_t)ncp->nc_nlookups++] = cp; ncp->nc_lookups = (char **)realloc(ncp->nc_lookups, - (size_t)(ncp->nc_nlookups+1) *sizeof(char *)); /* for next loop */ + ((size_t)ncp->nc_nlookups+1L) *sizeof(char *)); /* for next loop */ } } return (0); @@ -687,7 +687,7 @@ struct netconfig *ncp; p->nc_proto = (char *)strcpy(tmp,ncp->nc_proto); tmp = strchr(tmp, 0) + 1; p->nc_device = (char *)strcpy(tmp,ncp->nc_device); - p->nc_lookups = (char **)malloc((size_t)(p->nc_nlookups+1) * sizeof(char *)); + p->nc_lookups = (char **)malloc(((size_t)p->nc_nlookups+1L) * sizeof(char *)); if (p->nc_lookups == NULL) { free(p->nc_netid); return(NULL); diff --git a/libtirpc/src/rpc_callmsg.c b/libtirpc/src/rpc_callmsg.c index 48d34cd..cf864c6 100644 --- a/libtirpc/src/rpc_callmsg.c +++ b/libtirpc/src/rpc_callmsg.c @@ -86,7 +86,7 @@ xdr_callmsg(xdrs, cmsg) IXDR_PUT_INT32(buf, oa->oa_length); if (oa->oa_length) { memmove(buf, oa->oa_base, oa->oa_length); - buf += RNDUP(oa->oa_length) / sizeof (int32_t); + buf += RNDUP((size_t)oa->oa_length) / sizeof (int32_t); } oa = &cmsg->rm_call.cb_verf; IXDR_PUT_ENUM(buf, oa->oa_flavor); diff --git a/libtirpc/src/svc_dg.c b/libtirpc/src/svc_dg.c index 34bb7a8..3369394 100644 --- a/libtirpc/src/svc_dg.c +++ b/libtirpc/src/svc_dg.c @@ -125,7 +125,7 @@ svc_dg_create(fd, sendsize, recvsize) su = mem_alloc(sizeof (*su)); if (su == NULL) goto freedata; - su->su_iosz = ((MAX(sendsize, recvsize) + 3) / 4) * 4; + su->su_iosz = (((size_t)MAX(sendsize, recvsize) + 3) / 4) * 4; if ((rpc_buffer(xprt) = mem_alloc(su->su_iosz)) == NULL) goto freedata; assert(su->su_iosz < UINT_MAX); @@ -408,14 +408,14 @@ svc_dg_enablecache(transp, size) } uc->uc_size = size; uc->uc_nextvictim = 0; - uc->uc_entries = ALLOC(cache_ptr, size * SPARSENESS); + uc->uc_entries = ALLOC(cache_ptr, (size_t)size * SPARSENESS); if (uc->uc_entries == NULL) { warnx(cache_enable_str, alloc_err, "data"); FREE(uc, struct cl_cache, 1); mutex_unlock(&dupreq_lock); return (0); } - MEMZERO(uc->uc_entries, cache_ptr, size * SPARSENESS); + MEMZERO(uc->uc_entries, cache_ptr, (size_t)size * SPARSENESS); uc->uc_fifo = ALLOC(cache_ptr, size); if (uc->uc_fifo == NULL) { warnx(cache_enable_str, alloc_err, "fifo"); diff --git a/libtirpc/src/xdr_rec.c b/libtirpc/src/xdr_rec.c index 8245e33..8d5422a 100644 --- a/libtirpc/src/xdr_rec.c +++ b/libtirpc/src/xdr_rec.c @@ -254,7 +254,7 @@ xdrrec_getlong(xdrs, lp) /* first try the inline, fast case */ if ((rstrm->fbtbc >= sizeof(int32_t)) && - ((PtrToLong(rstrm->in_boundry) - PtrToLong(buflp)) >= sizeof(int32_t))) { + (((ssize_t)PtrToLong(rstrm->in_boundry) - (ssize_t)PtrToLong(buflp)) >= sizeof(int32_t))) { *lp = (long)ntohl((u_int32_t)(*buflp)); rstrm->fbtbc -= sizeof(int32_t); rstrm->in_finger += sizeof(int32_t); @@ -747,8 +747,8 @@ get_input_bytes(rstrm, addr, in_len) } while (len > 0) { - current = (size_t)(PtrToLong(rstrm->in_boundry) - - PtrToLong(rstrm->in_finger)); + current = (ssize_t)PtrToLong(rstrm->in_boundry) - + (ssize_t)PtrToLong(rstrm->in_finger); if (current == 0) { if (! fill_input_buf(rstrm)) return (FALSE); -- 2.42.1 From 512eaa400343fe8b15086cb978005d13d13a01a7 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Fri, 29 Dec 2023 04:07:17 +0100 Subject: [PATCH 3/5] daemon/readdir: |readdir_filter()| should use |eprintf()|, not stdio |readdir_filter()| should use |eprintf()|, not stdio. This also adds better diagnostic in case the backtracking buffer is too small. Also, |readdir_filter()| should be |static|. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/readdir.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/daemon/readdir.c b/daemon/readdir.c index 5cbe66c..1027e69 100644 --- a/daemon/readdir.c +++ b/daemon/readdir.c @@ -24,7 +24,6 @@ #include <stdlib.h> #include <stdbool.h> #include <string.h> -#include <stdio.h> #include "from_kernel.h" #include "nfs41_ops.h" #include "daemon_debug.h" @@ -45,6 +44,7 @@ #define FILTER_QM ('>') #define FILTER_DOT ('"') +static bool readdir_filter(const char *filter, const char *name) { @@ -106,8 +106,12 @@ readdir_filter(const char *filter, const char *name) /* backtracking buffer too small ? */ if (bt_pos > (MAX_NUM_BACKTRACKING - 3L)) { - (void)fprintf(stderr, - "ASSERT: bt buffer too small: MAX_NUM_BACKTRACKING=%x\n", + eprintf("readdir_filter(filter='%s',name='%s'): " + "bt buffer too small: " + "bt_pos=%d, MAX_NUM_BACKTRACKING=%x\n", + filter, + name, + (int)bt_pos, (int)MAX_NUM_BACKTRACKING); res = false; goto done; -- 2.42.1 From c7c36c90b61e8360e75c7cb4cf1940aeb457c239 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Fri, 29 Dec 2023 05:17:27 +0100 Subject: [PATCH 4/5] Compile all userland code with -DUNICODE -D_UNICODE As suggested by Martin Wege, we should compile all userland code with -DUNICODE -D_UNICODE, to make sure we always use the right APIs. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- build.vc19/libtirpc/libtirpc.vcxproj | 4 ++-- build.vc19/nfs41_np/nfs41_np.vcxproj | 4 ++-- build.vc19/nfs_install/nfs_install.vcxproj | 4 ++-- build.vc19/nfs_mount/nfs_mount.vcxproj | 4 ++-- build.vc19/nfsd/nfsd.vcxproj | 4 ++-- tests/winfsinfo1/Makefile | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.vc19/libtirpc/libtirpc.vcxproj b/build.vc19/libtirpc/libtirpc.vcxproj index 2a463fa..a639750 100644 --- a/build.vc19/libtirpc/libtirpc.vcxproj +++ b/build.vc19/libtirpc/libtirpc.vcxproj @@ -87,7 +87,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard_C>stdc17</LanguageStandard_C> </ClCompile> @@ -123,7 +123,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard_C>stdc17</LanguageStandard_C> </ClCompile> diff --git a/build.vc19/nfs41_np/nfs41_np.vcxproj b/build.vc19/nfs41_np/nfs41_np.vcxproj index f62fced..da8755d 100644 --- a/build.vc19/nfs41_np/nfs41_np.vcxproj +++ b/build.vc19/nfs41_np/nfs41_np.vcxproj @@ -87,7 +87,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard_C>stdc17</LanguageStandard_C> </ClCompile> @@ -121,7 +121,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard_C>stdc17</LanguageStandard_C> </ClCompile> diff --git a/build.vc19/nfs_install/nfs_install.vcxproj b/build.vc19/nfs_install/nfs_install.vcxproj index 6ca73bc..2fab595 100644 --- a/build.vc19/nfs_install/nfs_install.vcxproj +++ b/build.vc19/nfs_install/nfs_install.vcxproj @@ -87,7 +87,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard_C>stdc17</LanguageStandard_C> </ClCompile> @@ -119,7 +119,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard_C>stdc17</LanguageStandard_C> </ClCompile> diff --git a/build.vc19/nfs_mount/nfs_mount.vcxproj b/build.vc19/nfs_mount/nfs_mount.vcxproj index 7422a8c..73158bd 100644 --- a/build.vc19/nfs_mount/nfs_mount.vcxproj +++ b/build.vc19/nfs_mount/nfs_mount.vcxproj @@ -87,7 +87,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard_C>stdc17</LanguageStandard_C> </ClCompile> @@ -121,7 +121,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard_C>stdc17</LanguageStandard_C> </ClCompile> diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj index 4fa0012..c45559e 100644 --- a/build.vc19/nfsd/nfsd.vcxproj +++ b/build.vc19/nfsd/nfsd.vcxproj @@ -87,7 +87,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard_C>stdc17</LanguageStandard_C> </ClCompile> @@ -121,7 +121,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard_C>stdc17</LanguageStandard_C> </ClCompile> diff --git a/tests/winfsinfo1/Makefile b/tests/winfsinfo1/Makefile index 8e7d10a..91ef665 100644 --- a/tests/winfsinfo1/Makefile +++ b/tests/winfsinfo1/Makefile @@ -5,7 +5,7 @@ # POSIX Makefile winfsinfo: winfsinfo.c - gcc -Wall -g winfsinfo.c -o winfsinfo + gcc -Wall -DUNICODE=1 -D_UNICODE=1 -g winfsinfo.c -o winfsinfo all: winfsinfo -- 2.42.1 From 93958c395e19b4c1ecb8cdfd06355a4ec72b327d Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Fri, 29 Dec 2023 06:37:49 +0100 Subject: [PATCH 5/5] daemon: Increase up-/downcall buffer to accommodate paths >= 1024 bytes Increase up-/downcall buffer to accommodate paths >= 1024 bytes (1053 bytes is known to work, assuming the NFSv4 server runs on a filesystem which supports paths with more than 1024 bytes). This fixes "IOCTL_NFS41_READ failed 1450" messages when using long paths. Tested with this script: ---- snip ---- typeset -i i typeset longpath='' for ((i=0 ; ${#longpath} < 1024 ; i++)) ; do longpath+="longpath__$i/" done mkdir -p "$longpath" && cd "$longpath" printf "path_len=%d\n" "${#PWD}" git clone https://git.savannah.gnu.org/git/bash.git cd bash/ ./configure --with-curses make -j2 all ---- snip ---- Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/nfs41_const.h | 2 +- tests/manual_testing.txt | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/daemon/nfs41_const.h b/daemon/nfs41_const.h index 43d4cbf..f40eda5 100644 --- a/daemon/nfs41_const.h +++ b/daemon/nfs41_const.h @@ -39,7 +39,7 @@ #define NFS41_MAX_SERVER_CACHE 1024 #define NFS41_MAX_RPC_REQS 128 -#define UPCALL_BUF_SIZE 2048 +#define UPCALL_BUF_SIZE 4096 /* * NFS41_MAX_COMPONENT_LEN - MaximumComponentNameLength diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt index e6a8173..c23d337 100644 --- a/tests/manual_testing.txt +++ b/tests/manual_testing.txt @@ -36,11 +36,17 @@ time ksh93 -c 'export SHELL=/bin/bash HOSTTYPE="cygwin.i386-64"; /bin/bash ./bin # # bash # -mkdir longpath__________________________________________________________________________________________________________________________________________________________________________________________________________________________1 -cd longpath__________________________________________________________________________________________________________________________________________________________________________________________________________________________1 -mkdir longpath__________________________________________________________________________________________________________________________________________________________________________________________________________________________2 -cd longpath__________________________________________________________________________________________________________________________________________________________________________________________________________________________2 -echo ${#PWD} # (478 is know to work) + +# build bash with very long PWD (${#PWD} == 1053 is known to work +# if the nfs server supports path lengths > 1024) +typeset -i i +typeset longpath='' +for ((i=0 ; ${#longpath} < 1024 ; i++)) ; do + longpath+="longpath__$i/" +done +mkdir -p "$longpath" && cd "$longpath" +printf "path_len=%d\n" "${#PWD}" + git clone https://git.savannah.gnu.org/git/bash.git cd bash/ ./configure --with-curses -- 2.42.1

Title:

Privacy: Public Private

How long should your post be retained?

15 mins an hour a day a week a month forever

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