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: Patches for setattr, DrMemory, cleanup, tests+misc, 2024-11-05
Posted by Anonymous on Tue 5th Nov 2024 17:11
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 1b1d97af974fc5dd8b9466caf44915e33a8fc173 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 5 Nov 2024 09:58:20 +0100 Subject: [PATCH 1/8] daemon: |handle_nfs41_setattr_basicinfo()| should use |nfs41_cached_getattr()| |handle_nfs41_setattr_basicinfo()| should use |nfs41_cached_getattr()| to make sure we correctly get a diff between old and new attributes, even if there is no cache entry for that file (yet). Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/setattr.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/daemon/setattr.c b/daemon/setattr.c index 73c311a..e772463 100644 --- a/daemon/setattr.c +++ b/daemon/setattr.c @@ -66,14 +66,13 @@ static int handle_nfs41_setattr_basicinfo(void *daemon_context, setattr_upcall_a int status = NO_ERROR; int getattr_status; - getattr_status = nfs41_attr_cache_lookup(session_name_cache(state->session), - state->file.fh.fileid, &old_info); + getattr_status = nfs41_cached_getattr(state->session, + &state->file, &old_info); if (getattr_status) { DPRINTF(0, ("handle_nfs41_setattr_basicinfo(args->path='%s'): " - "nfs41_attr_cache_lookup() failed with error '%s'.\n", - args->path, - nfs_error_string(getattr_status))); - status = nfs_to_windows_error(getattr_status, ERROR_NOT_SUPPORTED); + "nfs41_cached_getattr() failed with error %d.\n", + args->path, getattr_status)); + status = getattr_status; goto out; } -- 2.45.1 From d45d2878e5ae26a2676fb4f5aca35455176fd476 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 5 Nov 2024 10:01:33 +0100 Subject: [PATCH 2/8] daemon: |handle_nfs41_setattr_basicinfo()| should use OR to add attributes. |handle_nfs41_setattr_basicinfo()| should use OR operator to add attributes to |info.attrmask.arr[*]| Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/setattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/setattr.c b/daemon/setattr.c index e772463..e01e962 100644 --- a/daemon/setattr.c +++ b/daemon/setattr.c @@ -82,7 +82,7 @@ static int handle_nfs41_setattr_basicinfo(void *daemon_context, setattr_upcall_a info.archive = basic_info->FileAttributes & FILE_ATTRIBUTE_ARCHIVE ? 1 : 0; if (info.hidden != old_info.hidden) { - info.attrmask.arr[0] = FATTR4_WORD0_HIDDEN; + info.attrmask.arr[0] |= FATTR4_WORD0_HIDDEN; info.attrmask.count = 1; } if (info.archive != old_info.archive) { @@ -90,7 +90,7 @@ static int handle_nfs41_setattr_basicinfo(void *daemon_context, setattr_upcall_a info.attrmask.count = 1; } if (info.system != old_info.system) { - info.attrmask.arr[1] = FATTR4_WORD1_SYSTEM; + info.attrmask.arr[1] |= FATTR4_WORD1_SYSTEM; info.attrmask.count = 2; } -- 2.45.1 From 8fcb3a359a08e9efa131554c59474a50038c111e Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 5 Nov 2024 10:08:19 +0100 Subject: [PATCH 3/8] cygwin: Update "SFU/Cygwin support" section in README.bintarball.txt Update "SFU/Cygwin support" section in README.bintarball.txt Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/README.bintarball.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt index 7a6271b..050007e 100644 --- a/cygwin/README.bintarball.txt +++ b/cygwin/README.bintarball.txt @@ -71,7 +71,9 @@ NFSv4.1 filesystem driver for Windows 10/11&Windows Server 2019 https://docs.oracle.com/cd/E86824_01/html/E54764/nfsref-1m.html - SFU/Cygwin support, including: - - uid/gid + - POSIX uid/gid+mode + - Backwards compatibility to Microsoft's NFSv3 driver + - Cygwin ACLs, e.g. setfacl/getfacl - Cygwin symlinks - Custom primary group support -- 2.45.1 From 0bc616fd65c4453eb376fe37414b496c151ac171 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 5 Nov 2024 13:59:13 +0100 Subject: [PATCH 4/8] daemon: Replace some ISO struct={ 0 } with C99 init or |memset(&struct,0,sizeof(struct))| Replace some ISO struct={ 0 } with C99 init or |memset(&struct,0,sizeof(struct))|, either saving some init work, or letting the profiler see the |memset()| Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/nfs41_ops.c | 13 +++++++++---- daemon/readwrite.c | 8 ++++++-- daemon/setattr.c | 13 ++++++++++--- daemon/util.h | 2 +- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/daemon/nfs41_ops.c b/daemon/nfs41_ops.c index f7af9d2..3f89b6a 100644 --- a/daemon/nfs41_ops.c +++ b/daemon/nfs41_ops.c @@ -767,7 +767,7 @@ int nfs41_write( nfs41_getattr_args getattr_args; nfs41_getattr_res getattr_res = {0}; bitmap4 attr_request; - nfs41_file_info info = { 0 }, *pinfo; + nfs41_file_info info, *pinfo; nfs41_superblock_getattr_mask(file->fh.superblock, &attr_request); @@ -789,8 +789,13 @@ int nfs41_write( write_args.data = data; write_res.resok4.verf = verf; - if (cinfo) pinfo = cinfo; - else pinfo = &info; + if (cinfo) { + pinfo = cinfo; + } + else { + (void)memset(&info, 0, sizeof(info)); + pinfo = &info; + } if (stable != UNSTABLE4) { /* if the write is stable, we can't rely on COMMIT to update @@ -1839,7 +1844,7 @@ enum nfsstat4 nfs41_fs_locations( nfs41_lookup_res lookup_res; nfs41_getattr_args getattr_args; nfs41_getattr_res getattr_res NDSH(= { 0 }); - bitmap4 attr_request = { 1, { FATTR4_WORD0_FS_LOCATIONS } }; + bitmap4 attr_request = { .count=1, .arr[0]=FATTR4_WORD0_FS_LOCATIONS }; nfs41_file_info info; compound_init(&compound, argops, resops, "fs_locations"); diff --git a/daemon/readwrite.c b/daemon/readwrite.c index bdfb902..c945fff 100644 --- a/daemon/readwrite.c +++ b/daemon/readwrite.c @@ -186,7 +186,9 @@ static int write_to_mds( int status = 0; /* on write verifier mismatch, retry N times before failing */ uint32_t retries = MAX_WRITE_RETRIES; - nfs41_file_info info = { 0 }; + nfs41_file_info info; + + (void)memset(&info, 0, sizeof(info)); retry_write: p = args->buffer; @@ -261,7 +263,9 @@ static int write_to_pnfs( readwrite_upcall_args *args = &upcall->args.rw; pnfs_layout_state *layout; int status = NO_ERROR; - nfs41_file_info info = { 0 }; + nfs41_file_info info; + + (void)memset(&info, 0, sizeof(info)); if (pnfs_layout_state_open(upcall->state_ref, &layout)) { status = ERROR_NOT_SUPPORTED; diff --git a/daemon/setattr.c b/daemon/setattr.c index e01e962..14cdc3e 100644 --- a/daemon/setattr.c +++ b/daemon/setattr.c @@ -62,10 +62,13 @@ static int handle_nfs41_setattr_basicinfo(void *daemon_context, setattr_upcall_a nfs41_open_state *state = args->state; nfs41_superblock *superblock = state->file.fh.superblock; stateid_arg stateid; - nfs41_file_info info = { 0 }, old_info = { 0 }; + nfs41_file_info info, old_info; int status = NO_ERROR; int getattr_status; + (void)memset(&info, 0, sizeof(info)); + (void)memset(&old_info, 0, sizeof(old_info)); + getattr_status = nfs41_cached_getattr(state->session, &state->file, &old_info); if (getattr_status) { @@ -370,7 +373,7 @@ out: static int handle_nfs41_set_size(void *daemon_context, setattr_upcall_args *args) { - nfs41_file_info info = { 0 }; + nfs41_file_info info; stateid_arg stateid; /* note: this is called with either FILE_END_OF_FILE_INFO or * FILE_ALLOCATION_INFO, both of which contain a single LARGE_INTEGER */ @@ -378,6 +381,8 @@ static int handle_nfs41_set_size(void *daemon_context, setattr_upcall_args *args nfs41_open_state *state = args->state; int status; + (void)memset(&info, 0, sizeof(info)); + EASSERT_MSG(args->buf_len == sizeof(size->QuadPart), ("args->buf_len=%ld\n", (long)args->buf_len)); @@ -423,9 +428,11 @@ static int handle_nfs41_link(void *daemon_context, setattr_upcall_args *args) nfs41_path_fh dst_dir, dst; nfs41_component dst_name; uint32_t depth = 0; - nfs41_file_info info = { 0 }; + nfs41_file_info info; int status; + (void)memset(&info, 0, sizeof(info)); + dst_path.len = (unsigned short)WideCharToMultiByte(CP_UTF8, 0, link->FileName, link->FileNameLength/sizeof(WCHAR), dst_path.path, NFS41_MAX_PATH_LEN, NULL, NULL); diff --git a/daemon/util.h b/daemon/util.h index 37d50a7..739c707 100644 --- a/daemon/util.h +++ b/daemon/util.h @@ -253,7 +253,7 @@ static __inline void nfstime_abs( OUT nfstime4 *result) { if (nt->seconds < 0) { - const nfstime4 zero = { 0, 0 }; + const nfstime4 zero = { .seconds=0LL, .nseconds=0UL }; nfstime_diff(&zero, nt, result); /* result = 0 - nt */ } else if (result != nt) memcpy(result, nt, sizeof(nfstime4)); -- 2.45.1 From 4386fb8e02e906effbd9c1f800681a7b081962fd Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 5 Nov 2024 15:45:59 +0100 Subject: [PATCH 5/8] daemon: Fix DrMemory hit in |bitmap_intersect()| Fix DrMemory hit in |bitmap_intersect()|, which happened because arr mask data were accessed beyond the maximum index specified by |bitmap4.count|. Example: ---- snip ---- Error #1: UNINITIALIZED READ: reading 4 byte(s) 0 bitmap_intersect [ms-nfs41-client\daemon\util.h:123] 1 nfs41_superblock_supported_attrs [ms-nfs41-client\daemon\nfs41.h:491] 2 nfs41_open [ms-nfs41-client\daemon\nfs41_ops.c:535] 3 do_open [ms-nfs41-client\daemon\open.c:311] 4 open_or_delegate [ms-nfs41-client\daemon\open.c:352] 5 handle_open [ms-nfs41-client\daemon\open.c:972] 6 upcall_handle [ms-nfs41-client\daemon\upcall.c:220] 7 nfsd_worker_thread_main [ms-nfs41-client\daemon\nfs41_daemon.c:201] 8 nfsd_thread_main [ms-nfs41-client\daemon\nfs41_daemon.c:239] 9 KERNEL32.dll!BaseThreadInitThunk +0x13 (0x00007ffbfeca7374 <KERNEL32.dll+0x17374>) ---- snip ---- Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/util.h b/daemon/util.h index 739c707..2b83bbf 100644 --- a/daemon/util.h +++ b/daemon/util.h @@ -120,7 +120,7 @@ static __inline void bitmap_intersect( { uint32_t i, count = 0; for (i = 0; i < 3; i++) { - dst->arr[i] &= src->arr[i]; + dst->arr[i] = ((i < dst->count)?dst->arr[i]:0) & ((i < src->count)?src->arr[i]:0); if (dst->arr[i]) count = i+1; } -- 2.45.1 From 49f0ff208036deda21b5c7c631baa16b46a21c77 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 5 Nov 2024 16:00:25 +0100 Subject: [PATCH 6/8] daemon: |handle_open()|: Remove some unnecessary ISO struct={ 0 } initialisations Remove some unnecessary ISO struct={ 0 } initialisations from |handle_open()| codepath. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/open.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/daemon/open.c b/daemon/open.c index 54b59e2..83fcac1 100644 --- a/daemon/open.c +++ b/daemon/open.c @@ -761,7 +761,7 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall) status = NO_ERROR; } else if (args->symlink.len) { /* handle cygwin symlinks */ - nfs41_file_info createattrs = { 0 }; + nfs41_file_info createattrs; createattrs.attrmask.count = 2; createattrs.attrmask.arr[0] = 0; createattrs.attrmask.arr[1] = FATTR4_WORD1_MODE; @@ -813,10 +813,11 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall) /* this should only happen for newly created files/dirs */ if (((info.attrmask.arr[1] & FATTR4_WORD1_OWNER) == 0) || ((info.attrmask.arr[1] & FATTR4_WORD1_OWNER_GROUP) == 0)) { - bitmap4 og_attr_request = { 0 }; + bitmap4 og_attr_request; nfs41_file_info og_info = { 0 }; og_attr_request.count = 2; + og_attr_request.arr[0] = 0; og_attr_request.arr[1] = FATTR4_WORD1_OWNER | FATTR4_WORD1_OWNER_GROUP; og_info.owner = og_info.owner_buf; @@ -909,7 +910,7 @@ static int handle_open(void *daemon_context, nfs41_upcall *upcall) (unsigned int)args->owner_group_local_gid, owner_group)); #endif /* NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES */ } else { - nfs41_file_info createattrs = { 0 }; + nfs41_file_info createattrs; uint32_t create = 0, createhowmode = 0, lookup_status = status; if (!lookup_status && (args->disposition == FILE_OVERWRITE || @@ -992,10 +993,11 @@ supersede_retry: char *s; int chgrp_status; stateid_arg stateid; - nfs41_file_info createchgrpattrs = { 0 }; + nfs41_file_info createchgrpattrs; createchgrpattrs.attrmask.count = 2; - createchgrpattrs.attrmask.arr[1] |= FATTR4_WORD1_OWNER_GROUP; + createchgrpattrs.attrmask.arr[0] = 0; + createchgrpattrs.attrmask.arr[1] = FATTR4_WORD1_OWNER_GROUP; createchgrpattrs.owner_group = createchgrpattrs.owner_group_buf; /* fixme: we should store the |owner_group| name in |upcall| */ if (!get_token_primarygroup_name(upcall->currentthread_token, -- 2.45.1 From 65978f4e4929d41a23744e3528d56aa1b7eba8fb Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 5 Nov 2024 16:03:16 +0100 Subject: [PATCH 7/8] daemon: Add comment that |nfs41_file_info_cpy()| can cause DrMemory hits Add comment that |nfs41_file_info_cpy()| can cause DrMemory hits. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/fileinfoutil.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/daemon/fileinfoutil.c b/daemon/fileinfoutil.c index 29f9b4d..a5269fe 100644 --- a/daemon/fileinfoutil.c +++ b/daemon/fileinfoutil.c @@ -447,6 +447,11 @@ void nfs41_file_info_cpy( OUT nfs41_file_info *dest, IN const nfs41_file_info *src) { + /* + * FIXME: Using |memcpy()| here over the whole struct + * |nfs41_file_info| will trigger DrMemory uninitialized + * variable hits if |*src| was not completely initialized + */ (void)memcpy(dest, src, sizeof(nfs41_file_info)); if (src->owner != NULL) dest->owner = dest->owner_buf; -- 2.45.1 From 28641a2910e724d10fcabf5fa0564bf075462e96 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 5 Nov 2024 18:00:56 +0100 Subject: [PATCH 8/8] tests: nfsbuildtest bash build should install bash to install_root/ dir nfsbuildtest bash build should install bash to install_root/ dir to test /usr/bin/install&co. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- tests/manual_testing.txt | 2 ++ tests/nfsbuildtest/nfsbuildtest.ksh93 | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt index 883f722..65848c8 100644 --- a/tests/manual_testing.txt +++ b/tests/manual_testing.txt @@ -38,6 +38,8 @@ # nedit # emacs # cygport +# gettext +# gettext-devel # ---- snip ---- # # - Benchmarking/profiling should be done with the realtime virus checker diff --git a/tests/nfsbuildtest/nfsbuildtest.ksh93 b/tests/nfsbuildtest/nfsbuildtest.ksh93 index 15c3c6b..7ea4921 100644 --- a/tests/nfsbuildtest/nfsbuildtest.ksh93 +++ b/tests/nfsbuildtest/nfsbuildtest.ksh93 @@ -262,6 +262,9 @@ function bash_build # patch sources and configure build # + # disable loadable plugins + sed -i -E 's/-\( cd \$\(LOADABLES_DIR\) && \$\(MAKE\) \$\(MFLAGS\) DESTDIR=\$\(DESTDIR\) \$@ \)//' Makefile.in + # Cygwin: workaround for configure using cp -p where ln -s should be used # (this is an automake/autoconf issue, they should trust Cygwin and not use # ancient workarounds for issues which no longer exists) @@ -304,9 +307,9 @@ function bash_build # build bash # if (( (cygwin_vers.major*1000+cygwin_vers.minor) >= 3005 )) ; then - time ksh93 -c 'export SHELL=/bin/ksh93 ; bmake -j8' + time ksh93 -c 'export SHELL=/bin/ksh93 ; bmake -j8 install DESTDIR=$PWD/install_root' else - time ksh93 -c 'export SHELL=/bin/ksh93 ; make -j8' + time ksh93 -c 'export SHELL=/bin/ksh93 ; make -j8 install DESTDIR=$PWD/install_root' fi echo $? @@ -548,6 +551,8 @@ function main is_cygwin_pkg_installed icp 'make' || (( errc++ )) fi is_cygwin_pkg_installed icp 'libncurses-devel' || (( errc++ )) + is_cygwin_pkg_installed icp 'gettext' || (( errc++ )) + is_cygwin_pkg_installed icp 'gettext-devel' || (( errc++ )) (( errc > 0 )) && return 1 bash_build return $? -- 2.45.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