July 2013 - Wine-Devel - list.winehq.org

[PATCH v7 0/7] Add O_DENY* support for VFS and CIFS/NFS
by Pavel Shilovsky July 1, 2013

July 1, 2013

Main changes from v6: 1) Fix LOCK_DELETE mandatory lock detection for O_DENYDELETE opens. 2) Add ESHAREDENIED error code definition for alpha, mips, parisc and sparc arches. 3) Remove code changes in do_last function if sharelocks are disabled. Main changes from v5: 1) O_DENYDELETE is now supported by VFS. 2) ESHAREDENIED erro code is introduced to be returned on sharelock conflicts. 3) forcemand dependancy is removed. CIFS module detects if it should use NTCreateAndX command according to existence of O_DENY flags. 4) Term 'deny lock' is replaced by 'sharelock' (function names, code comments, patch descriptions). Main changes from v4: 1) deny_lock_file uses FS_DOES_SHARELOCK flag from fs_flags to determine whether to use VFS locks or not. 2) Make nfs code return -EBUSY for share conflicts (was -EACCESS). Main changes from v3 1) O_DENYMAND is removed, sharelock mount option is introduced. 2) Patch fcntl.h and VFS patches are united into one. 3) flock/LOCK_MAND is disabled for sharelock mounts. This patchset adds support of O_DENY* flags for Linux fs layer. These flags can be used by any application that needs share reservations to organize a file access. VFS already has some sort of this capability - now it's done through flock/LOCK_MAND mechanism, but that approach is non-atomic. This patchset builds new capabilities on top of the existing one but doesn't bring any changes into the flock call semantic. These flags can be used by NFS (built-in-kernel) and CIFS (Samba) servers and Wine applications through VFS (for local filesystems) or CIFS/NFS modules. This will help when e.g. Samba and NFS server share the same directory for Windows and Linux users or Wine applications use Samba/NFS share to access the same data from different clients. According to the previous discussions the most problematic question is how to prevent situations like DoS attacks where e.g /lib/liba.so file can be open with DENYREAD, or smth like this. That's why extra mount option 'sharelock' is added for switching on/off O_DENY* flags processing. It allows us to avoid use of these flags on critical places (like /, /lib) and turn them on if we really want it proccessed that way. The patchset introduces 3 new flags: O_DENYREAD - to prevent other opens with read access, O_DENYWRITE - to prevent other opens with write access, O_DENYDELETE - to prevent delete operations (this flag can't be implemented for NFS due to the protocol restrictions). The patchset avoids data races problem on newely created files: open with O_CREAT can return new -ESHAREDENIED error code for a successfully created file if this files was locked with a sharelock by another task. Also, it turns off flock/LOCK_MAND capability for mounts with 'sharelock' option. This lets us not mix one share reservation approach with another. The #1 and #2 patches add flags to fcntl and implements VFS part. The patches #3 and #4 are related to CIFS-specific changes, #5 and #6 describe NFS and NFSD parts, #7 turns off flock/LOCK_MAND for mounts with 'sharelock' option. The preliminary patch for Samba that replaces the existing use of flock/LOCK_MAND mechanism with O_DENY* flags: http://git.etersoft.ru/people/piastry/packages/?p=samba.git;a=commitdiff;h=… The future part of open man page patch: ----- O_DENYREAD, O_DENYWRIYE, O_DENYDELETE - used to inforce a mandatory share reservation scheme of the file access. If these flag is passed, the open fails with -ESHAREDENIED in following cases: 1) if O_DENYREAD flag is specified and there is another open with READ access to the file; 2) if O_DENYWRITE flag is specified and there is another open with WRITE access to the file; 3) if READ access is requested and there is another open with O_DENYREAD flags; 4) if WRITE access is requested and there is another open with O_DENYWRITE flags. If O_DENYDELETE flag is specified and the open succeded, any further unlink operation will fail with -ESHAREDENIED untill this open is closed. Now this flag is processed by VFS and CIFS filesystem. This mechanism is done through flocks. If O_DENY* flags are specified, flock syscall is processed after the open. The share modes are translated into flock according the following rules: 1) !O_DENYREAD -> LOCK_READ | LOCK_MAND 2) !O_DENYWRITE -> LOCK_WRITE | LOCK_MAND 3) !O_DENYDELETE -> LOCK_DELETE | LOCK_MAND --- Pavel Shilovsky (7): VFS: Introduce new O_DENY* open flags VFS: Add O_DENYDELETE support for VFS CIFS: Add share_access parm to open request CIFS: Add O_DENY* open flags support NFSv4: Add O_DENY* open flags support NFSD: Pass share reservations flags to VFS locks: Disable LOCK_MAND support for MS_SHARELOCK mounts arch/alpha/include/uapi/asm/errno.h | 2 + arch/mips/include/uapi/asm/errno.h | 2 + arch/parisc/include/uapi/asm/errno.h | 2 + arch/sparc/include/uapi/asm/errno.h | 2 + fs/cifs/cifsacl.c | 8 +- fs/cifs/cifsfs.c | 2 +- fs/cifs/cifsglob.h | 18 +++- fs/cifs/cifsproto.h | 8 +- fs/cifs/cifssmb.c | 50 ++++++----- fs/cifs/dir.c | 16 ++-- fs/cifs/file.c | 25 ++++-- fs/cifs/inode.c | 21 ++--- fs/cifs/link.c | 25 ++---- fs/cifs/netmisc.c | 2 +- fs/cifs/readdir.c | 5 +- fs/cifs/smb1ops.c | 16 ++-- fs/cifs/smb2file.c | 10 +-- fs/cifs/smb2inode.c | 4 +- fs/cifs/smb2maperror.c | 2 +- fs/cifs/smb2ops.c | 10 ++- fs/cifs/smb2pdu.c | 6 +- fs/cifs/smb2proto.h | 14 +-- fs/fcntl.c | 5 +- fs/locks.c | 160 ++++++++++++++++++++++++++++++++--- fs/namei.c | 56 +++++++++++- fs/nfs/dir.c | 4 + fs/nfs/internal.h | 3 +- fs/nfs/nfs4file.c | 4 + fs/nfs/nfs4proc.c | 4 +- fs/nfs/nfs4super.c | 9 +- fs/nfs/nfs4xdr.c | 21 ++++- fs/nfs/super.c | 6 +- fs/nfsd/nfs4state.c | 46 +++++++++- fs/nfsd/nfsproc.c | 1 + fs/proc_namespace.c | 1 + include/linux/fs.h | 14 +++ include/uapi/asm-generic/errno.h | 2 + include/uapi/asm-generic/fcntl.h | 12 +++ include/uapi/linux/fs.h | 1 + 39 files changed, 464 insertions(+), 135 deletions(-) -- 1.8.1.5

1 7

Re: po: Update Czech translation - 2nd attempt
by Nikolay Sivov July 1, 2013

July 1, 2013

On 6/28/2013 18:21, Pavel Borecki wrote: Hi, Pavel. Looks like you're using poedit or something with similar habit of touching lines location headers: --- > -#: appwiz.rc:66 appwiz.rc:42 cryptui.rc:343 msacm32.rc:37 winecfg.rc:191 > -#: winecfg.rc:228 wordpad.rc:245 > +#: appwiz.rc:66 > +#: appwiz.rc:42 > +#: cryptui.rc:343 > +#: msacm32.rc:37 > +#: winecfg.rc:191 > +#: winecfg.rc:228 > +#: wordpad.rc:245 > msgid "&Remove" > msgstr "Odeb&rat" --- This adds a lot of diff lines that you don't really want.

1 0

Re: [PATCH] advapi32: RegDeleteKey tests for merged view of HKCR
by wine.dev＠web.de July 1, 2013

July 1, 2013

Hi George. > [PATCH] advapi32: RegDeleteKey tests for merged view of HKCR > http://newtestbot.winehq.org/JobDetails.pl?Key=1403 > --- > dlls/advapi32/tests/registry.c | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) I can't test atm, but it looks good while reading. Please add a [try 2] to the subject and send it to wine-patches. -- Detlef

1 0

Re: [RFC PATCH] loader: allow overriding pthread_create correctly on linux
by Austin English July 1, 2013

July 1, 2013

On Fri, Jun 28, 2013 at 3:53 AM, Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > This should be enough to fix bug #30557 in the most thorough possible way. > Only tested on ubuntu precise 32-bits atm, but I believe it should work on 64-bits too. > > TODO: pthread_create_2_0 is not handled correctly right now, so it will fail on ancient glibc's < 2.2. > But because NPTL requires a slightly newer glibc than that I do not believe it will be a real issue. > > Comments welcome :-) > --- > diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c > index 01a8026..e9775c3 100644 > --- a/dlls/ntdll/thread.c > +++ b/dlls/ntdll/thread.c > @@ -33,6 +33,7 @@ > #ifdef HAVE_SYS_SYSCALL_H > #include <sys/syscall.h> > #endif > +#include <errno.h> > > #define NONAMELESSUNION > #include "ntstatus.h" > @@ -58,6 +59,7 @@ struct startup_info > TEB *teb; > PRTL_THREAD_START_ROUTINE entry_point; > void *entry_arg; > + BOOL native_thread; > }; > > static PEB *peb; > @@ -186,6 +188,20 @@ done: > return status; > } > > +#ifdef __linux__ > +extern typeof(pthread_create) *__glob_pthread_create, *call_pthread_create; > +static typeof(pthread_create) __hook_pthread_create; > + > +static void thread_wrap_init(void) > +{ > + call_pthread_create = __hook_pthread_create; > +} > + > +#else > +#define __glob_pthread_create pthread_create > +#define thread_wrap_init() > +#endif > + > /*********************************************************************** > * thread_init > * > @@ -204,6 +220,7 @@ HANDLE thread_init(void) > struct ntdll_thread_data *thread_data; > static struct debug_info debug_info; /* debug info for initial thread */ > > + thread_wrap_init(); > virtual_init(); > > /* reserve space for shared user data */ > @@ -327,11 +344,7 @@ void terminate_thread( int status ) > pthread_exit( UIntToPtr(status) ); > } > > - > -/*********************************************************************** > - * exit_thread > - */ > -void exit_thread( int status ) > +static void exit_thread_common( int status ) > { > static void *prev_teb; > TEB *teb; > @@ -377,9 +390,60 @@ void exit_thread( int status ) > close( ntdll_get_thread_data()->wait_fd[1] ); > close( ntdll_get_thread_data()->reply_fd ); > close( ntdll_get_thread_data()->request_fd ); > +} > + > +void exit_thread( int status ) > +{ > + exit_thread_common(status); > pthread_exit( UIntToPtr(status) ); > } > > +#ifdef __linux__ > + > +struct unix_arg { > + void *(*start)(void *); > + void *arg; > +}; > + > +/* dummy used for comparison */ > +static DWORD native_unix_start; > + > +static void call_native_cleanup(void *arg) > +{ > + RtlFreeThreadActivationContextStack(); > + exit_thread_common(0); > +} > + > +static int > +__hook_pthread_create(pthread_t *thread, const pthread_attr_t *attr, > + void *(*start_routine) (void *), void *parm) > +{ > + NTSTATUS ret; > + struct unix_arg arg; > + arg.start = start_routine; > + arg.arg = parm; > + > + TRACE("Overriding thread creation!\n"); > + if (attr) > + FIXME("thread attributes ignored!\n"); > + > + ret = RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, NULL, 0, 0, (void*)&native_unix_start, &arg, NULL, (void*)thread ); > + if (ret != STATUS_SUCCESS) > + FIXME("ret: %08x\n", ret); > + switch (ret) { > + case STATUS_SUCCESS: > + return 0; > + case STATUS_NO_MEMORY: > + return ENOMEM; > + case STATUS_TOO_MANY_OPENED_FILES: > + return EMFILE; > + default: > + ERR("Unhandled ntstatus %08x\n", ret); > + return ENOMEM; > + } > +} > + > +#endif > > /*********************************************************************** > * start_thread > @@ -412,9 +476,18 @@ static void start_thread( struct startup_info *info ) > if (TRACE_ON(relay)) > DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); > > - call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); > -} > +#ifdef __linux__ > + if (info->native_thread) { > + void *(*start)(void*) = (void*)func; > > + FIXME("Started native thread %08x\n", GetCurrentThreadId()); > + pthread_cleanup_push(call_native_cleanup, NULL); > + pthread_exit(start(arg)); > + pthread_cleanup_pop(1); > + } else > +#endif > + call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); > +} > > /*********************************************************************** > * RtlCreateUserThread (NTDLL.@) > @@ -497,8 +570,18 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * > > info = (struct startup_info *)(teb + 1); > info->teb = teb; > - info->entry_point = start; > - info->entry_arg = param; > +#ifdef __linux__ > + info->native_thread = (void*)start == (void*)&native_unix_start; > + if (info->native_thread) { > + struct unix_arg *arg = param; > + info->entry_point = (void*)arg->start; > + info->entry_arg = arg->arg; > + } else > +#endif > + { > + info->entry_point = start; > + info->entry_arg = param; > + } > > thread_data = (struct ntdll_thread_data *)teb->SpareBytes1; > thread_data->request_fd = request_pipe[1]; > @@ -513,7 +596,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * > (char *)teb->Tib.StackBase - (char *)teb->DeallocationStack ); > pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ > interlocked_xchg_add( &nb_threads, 1 ); > - if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info )) > + if (__glob_pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info )) > { > interlocked_xchg_add( &nb_threads, -1 ); > pthread_attr_destroy( &attr ); > @@ -523,6 +606,11 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * > pthread_attr_destroy( &attr ); > pthread_sigmask( SIG_SETMASK, &sigset, NULL ); > > +#ifdef __linux__ > + if (native_thread && id) > + *(pthread_t*)id = pthread_id; > + else > +#endif > if (id) id->UniqueThread = ULongToHandle(tid); > if (handle_ptr) *handle_ptr = handle; > else NtClose( handle ); > diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c > index 25eceb8..7417941 100644 > --- a/dlls/winegstreamer/glibthread.c > +++ b/dlls/winegstreamer/glibthread.c > @@ -43,6 +43,7 @@ > #include <stdlib.h> > #include <stdio.h> > > +#if 0 > #include "windef.h" > #include "winbase.h" > #include "winnls.h" > @@ -388,3 +389,15 @@ void g_thread_impl_init (void) > g_thread_self_tls = TlsAlloc (); > g_thread_init(&g_thread_functions_for_glib_use_default); > } > + > +#else > + > +void g_thread_impl_init (void) > +{ > + static gboolean beenhere = FALSE; > + > + if (!beenhere++) > + g_thread_init(NULL); > +} > + > +#endif > diff --git a/libs/wine/loader.c b/libs/wine/loader.c > index 094e5e1..69f4a38 100644 > --- a/libs/wine/loader.c > +++ b/libs/wine/loader.c > @@ -69,6 +69,11 @@ char **__wine_main_argv = NULL; > WCHAR **__wine_main_wargv = NULL; > char **__wine_main_environ = NULL; > > +#ifdef __linux__ > +#include <pthread.h> > +typeof(pthread_create) *call_pthread_create, *__glob_pthread_create; > +#endif > + > struct dll_path_context > { > unsigned int index; /* current index in the dll path list */ > diff --git a/libs/wine/wine.map b/libs/wine/wine.map > index 2159fac..694869a 100644 > --- a/libs/wine/wine.map > +++ b/libs/wine/wine.map > @@ -117,6 +117,8 @@ WINE_1.0 > wine_utf8_mbstowcs; > wine_utf8_wcstombs; > wine_wctype_table; > + __glob_pthread_create; > + call_pthread_create; > > local: *; > }; > diff --git a/loader/main.c b/loader/main.c > index ac67290..14b2428 100644 > --- a/loader/main.c > +++ b/loader/main.c > @@ -202,6 +202,27 @@ static int pre_exec(void) > > #endif > > +#ifdef __linux__ > + > +extern typeof(pthread_create) *call_pthread_create, *__glob_pthread_create; > + > +int pthread_create(pthread_t *thread, const pthread_attr_t *attr, > + void *(*start_routine) (void *), void *arg) > +{ > + return call_pthread_create(thread, attr, start_routine, arg); > +} > + > +static void init_thread_hook(void) { > + call_pthread_create = __glob_pthread_create = dlvsym(RTLD_NEXT, "pthread_create", "GLIBC_2.2"); > + if (!__glob_pthread_create) > + call_pthread_create = __glob_pthread_create = dlvsym(RTLD_NEXT, "pthread_create", "GLIBC_2.1"); > +} > + > +#else > + > +#define init_thread_hook() > + > +#endif > > /********************************************************************** > * main > @@ -211,6 +232,8 @@ int main( int argc, char *argv[] ) > char error[1024]; > int i; > > + init_thread_hook(); > + > if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ > { > static char noexec[] = "WINELOADERNOEXEC=1"; Fails to compile here (as mentioned on bug 30557): gcc -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_NTSYSTEM_ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -g -O2 -o thread.o thread.c thread.c: In function ‘RtlCreateUserThread’: thread.c:610:9: error: ‘native_thread’ undeclared (first use in this function) thread.c:610:9: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [thread.o] Error 1 make[1]: Leaving directory `/home/austin/wine-git/dlls/ntdll' make: *** [dlls/ntdll] Error 2 I tried Ruslan's fixed patch, which failed as well: gcc -m32 -c -I. -I. -I../include -I../include -D__WINESRC__ -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -g -O2 -fno-builtin -o main.o main.c gcc -m32 -o wine -Wl,--export-dynamic -Wl,--section-start,.interp=0x7bf00400 main.o -L../libs/wine -lwine ../libs/port/libwine_port.a -lpthread -Wl,--rpath,\$ORIGIN/../libs/wine /usr/bin/ld: main.o: undefined reference to symbol 'dlvsym@@GLIBC_2.1' /usr/bin/ld: note: 'dlvsym@@GLIBC_2.1' is defined in DSO /lib/libdl.so.2 so try adding it to the linker command line /lib/libdl.so.2: could not read symbols: Invalid operation collect2: error: ld returned 1 exit status make[1]: *** [wine] Error 1 make[1]: Leaving directory `/home/austin/wine-git/loader' make: *** [loader] Error 2 this is 32-bit wine on fedora 64 (against 1.6-rc4). -- -Austin

1 0