January 2014 - Wine-devel - list.winehq.org

[PATCH v7 0/7] Add O_DENY* support for VFS and CIFS/NFS
by Pavel Shilovsky 04 Feb '14

04 Feb '14

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 mechanis, but that approach is non-atomic. This patchset build 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 to avoid use of these flags on critical places (like /, /lib) and turn them on if we really want it proccessed that way. So, we have 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 The patchset avoids data races problem on newely created files: open with O_CREAT can return the -ESHAREDENIED error for a successfully created file if this files was locked with a sharelock by another task. Also, it turns flock/LOCK_MAND capability off for mounts with 'sharelock' option. This lets not mix one share reservation approach with another. Patches #1, #2 and #3 add O_DENY* flags to fcntl and implement VFS part. A patch #4 is related to CIFS client changes, #5 -- NFSD, #6 and #7 describe NFSv4 client parts. 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. NFS returns -EINVAL for opens with this flag. 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 locks: Disable LOCK_MAND support for MS_SHARELOCK mounts CIFS: Add O_DENY* open flags support NFSD: Pass share reservations flags to VFS NFSv4: Add deny state handling for nfs4_state struct NFSv4: Add O_DENY* open flags support arch/alpha/include/uapi/asm/errno.h | 2 + arch/alpha/include/uapi/asm/fcntl.h | 3 + arch/mips/include/uapi/asm/errno.h | 2 + arch/parisc/include/uapi/asm/errno.h | 2 + arch/parisc/include/uapi/asm/fcntl.h | 3 + arch/sparc/include/uapi/asm/errno.h | 2 + arch/sparc/include/uapi/asm/fcntl.h | 3 + fs/cifs/cifsacl.c | 2 + fs/cifs/cifsfs.c | 2 +- fs/cifs/cifsglob.h | 17 +- fs/cifs/cifssmb.c | 2 +- fs/cifs/dir.c | 6 + fs/cifs/file.c | 20 ++- fs/cifs/inode.c | 12 +- fs/cifs/link.c | 2 + fs/cifs/netmisc.c | 2 +- fs/cifs/smb1ops.c | 3 + fs/cifs/smb2inode.c | 1 + fs/cifs/smb2maperror.c | 2 +- fs/cifs/smb2ops.c | 6 + fs/cifs/smb2pdu.c | 2 +- fs/fcntl.c | 5 +- fs/locks.c | 161 ++++++++++++++++-- fs/namei.c | 56 +++++- fs/nfs/dir.c | 39 ++++- fs/nfs/inode.c | 8 +- fs/nfs/internal.h | 3 +- fs/nfs/nfs4_fs.h | 83 ++++++++- fs/nfs/nfs4file.c | 8 +- fs/nfs/nfs4proc.c | 310 +++++++++++++++++++++++----------- fs/nfs/nfs4state.c | 65 ++++--- fs/nfs/nfs4super.c | 9 +- fs/nfs/nfs4xdr.c | 21 ++- fs/nfs/super.c | 7 +- fs/nfsd/nfs4state.c | 46 ++++- fs/nfsd/nfsproc.c | 1 + fs/proc_namespace.c | 1 + include/linux/fs.h | 15 ++ include/linux/nfs_fs.h | 5 +- include/linux/nfs_xdr.h | 1 + include/uapi/asm-generic/errno.h | 2 + include/uapi/asm-generic/fcntl.h | 12 ++ include/uapi/linux/fs.h | 1 + 43 files changed, 789 insertions(+), 166 deletions(-) -- 1.7.10.4

4 18

dpnet patches
by Stefan Dösinger 01 Feb '14

01 Feb '14

Hi Alistair, A while ago I promised to have a closer look at your dpnet patches. It’s a bit delayed, but here are some comments. How serious are you about dplay? Do you intend to do more work towards implementing it, or is that just wishful thinking on my part? http://source.winehq.org/patches/data/101857: The entire patch doesn’t do all that much, I think it’s best to hold of on that change until the function is meaningfully implemented - unless having a proper return value helps you in some way I’m missing. > + void *buffer = malloc(256); Please use HeapAlloc / HeapFree. http://source.winehq.org/patches/data/101856: > +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); Isn’t that defined somewhere already? Do you need GUID_NULL to signal an uninitialized GUID? Is there a reason why setting the pointer to NULL doesn’t work? > -IMPORTS = dpnet ole32 > +IMPORTS = ole32 I’m not sure about this one, but winetest can automatically skip tests if the tested DLL doesn’t exist. It might use the imported libraries for that, or maybe just the name of the test. In the former case I think you want to keep the dpnet import. http://source.winehq.org/patches/data/101855: http://source.winehq.org/patches/data/101854: Did you think about sharing code between IDirectPlay8Peer and IDirectPlay8Server? The interfaces themselves have no relationship, but their methods are similar. http://source.winehq.org/patches/data/101853: > +typedef struct IDirectPlay8ClientImpl > +{ > + IDirectPlay8Client IDirectPlay8Client_iface; > + LONG ref; > +} IDirectPlay8ClientImpl; Are you sure you want to move the definition out of the library-wide header? If that works out ok it’s great, but you may need something other than the public interface in some other files in this library. I recommend to work without the typedef, but that should be changed in a separate patch. > - ULONG refCount = InterlockedIncrement(&This->ref); > + ULONG ref = InterlockedIncrement(&This->ref); > - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); > + TRACE("(%p) ref=%d\n", This, ref); ULONG is unsigned, you have to use %u. http://source.winehq.org/patches/data/101852 > + 'DPNSPModemModem' > + { > + val 'Friendly Name' = s 'Modem Connection For DirectPlay' > + val 'GUID' = s '{6D4A3650-628D-11D2-AE0F-006097B01411}' > + } > + > + 'DPNSPModemSerial' > + { > + val 'Friendly Name' = s 'Serial Connection For DirectPlay' > + val 'GUID' = s '{743B5D60-628D-11D2-AE0F-006097B01411}' > + } I know that those always exist on Windows, but wouldn’t it be better to not advertise them until we have an actual implementation? I think advertising DPNSPWinsockTCP alone should be ok for the start.

2 1

spam filtering errors
by Jonas Maebe 31 Jan '14

31 Jan '14

Hi, Since the latest update of the mailing list server, a lot of mails sent to this list are wrongly classified as spam by CodeWeavers' mail server. I've already sent a mail about this to postmaster(a)codeweavers.com several months ago, but got no reply and nothing appears to have changed. It seems that the main culprit is the "SINGLE_HEADER_3K" spamassassin check, in combination with a very low spam score threshold (1.0). Below is an example from Stefan Dösinger's last mail (titled "dpnet patches"). Jonas X-Spam-Flag: YES X-Spam-Report: Spam detection software, running on the system "wine.codeweavers.com", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Alistair, A while ago I promised to have a closer look at your dpnet patches. ItXs a bit delayed, but here are some comments. How serious are you about dplay? Do you intend to do more work towards implementing it, or is that just wishful thinking on my part? [...] Content analysis details: (1.1 points, 1.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 SINGLE_HEADER_3K A single header contains 3K-4K characters 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (stefandoesinger[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid

3 2

Re: user32/tests: Don't compare boolean expressions with TRUE or FALSE
by Marvin 31 Jan '14

31 Jan '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=4560 Your paranoid android. === wxppro (32 bit win) === win.c:892: Test failed: wrong dwWindowStatus: 0001 != 0000 active 0005013E fg 00030052 in hook HCBT_ACTIVATE win.c:2952: Test failed: GetActiveWindow() = 00000000 win.c:2952: Test failed: GetFocus() = 00000000 win.c:2975: Test failed: GetActiveWindow() = 00000000 win.c:2975: Test failed: GetFocus() = 00000000 win.c:3036: Test failed: GetActiveWindow() = 00000000 win.c:3036: Test failed: GetFocus() = 00000000 === wvista (32 bit win) === win.c:892: Test failed: wrong dwWindowStatus: 0001 != 0000 active 000602B4 fg 00020222 in hook HCBT_ACTIVATE === w2008s64 (32 bit win) === win.c:892: Test failed: wrong dwWindowStatus: 0001 != 0000 active 000600F0 fg 0001004E in hook HCBT_ACTIVATE win.c:2952: Test failed: GetActiveWindow() = 00000000 win.c:2952: Test failed: GetFocus() = 00000000 win.c:2975: Test failed: GetActiveWindow() = 00000000 win.c:2975: Test failed: GetFocus() = 00000000 win.c:3036: Test failed: GetActiveWindow() = 00000000 win.c:3036: Test failed: GetFocus() = 00000000 === w2008s64 (64 bit win) === win.c:892: Test failed: wrong dwWindowStatus: 0001 != 0000 active 00000000000600F0 fg 000000000001004E in hook HCBT_ACTIVATE win.c:2952: Test failed: GetActiveWindow() = 0000000000000000 win.c:2952: Test failed: GetFocus() = 0000000000000000 win.c:2975: Test failed: GetActiveWindow() = 0000000000000000 win.c:2975: Test failed: GetFocus() = 0000000000000000 win.c:3036: Test failed: GetActiveWindow() = 0000000000000000 win.c:3036: Test failed: GetFocus() = 0000000000000000 === w7pro64 (64 bit win) === win.c:892: Test failed: wrong dwWindowStatus: 0001 != 0000 active 0000000000060106 fg 0000000000010064 in hook HCBT_ACTIVATE win.c:2952: Test failed: GetActiveWindow() = 0000000000000000 win.c:2952: Test failed: GetFocus() = 0000000000000000 win.c:2975: Test failed: GetActiveWindow() = 0000000000000000 win.c:2975: Test failed: GetFocus() = 0000000000000000 win.c:3036: Test failed: GetActiveWindow() = 0000000000000000 win.c:3036: Test failed: GetFocus() = 0000000000000000

1 0

Re: [PATCH] oleaut32: Fix RecordCopy()/RecordClear() behavior (try2)
by Marvin 30 Jan '14

30 Jan '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=4552 Your paranoid android. === build (build) === Make failed

1 0

Re: [PATCH] oleaut32: Fix RecordCopy()/RecordClear() behavior
by Alexandre Julliard 30 Jan '14

30 Jan '14

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > --- > dlls/oleaut32/recinfo.c | 75 +++++++++++++++++++++- > dlls/oleaut32/tests/test_tlb.idl | 6 +- > dlls/oleaut32/tests/vartype.c | 130 +++++++++++++++++++++++++++++++++++++++ > dlls/oleaut32/usrmarshal.c | 3 +- > dlls/oleaut32/variant.h | 2 +- > 5 files changed, 210 insertions(+), 6 deletions(-) It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M oleaut32.dll -p oleaut32_test.exe.so typelib && touch typelib.ok typelib.c:3977: Test failed: typeattr->cbSizeInstance expected 4 got 16 make: *** [typelib.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/2] wmp: Added tests.
by Marvin 30 Jan '14

30 Jan '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=4551 Your paranoid android. === build (build) === Recreation of tests/Makefile failed

1 0

Re: [3/4] msxml3: Add separate QueryInterface implementation for IEnumVARIANT interface exported by IXMLElementCollection. Resend.
by Henri Verbeet 30 Jan '14

30 Jan '14

On 30 January 2014 06:07, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > + FIXME("interface %s not implemented\n", debugstr_guid(riid)); > + return E_NOINTERFACE; I don't know about xmlelem_collection_IEnumVARIANT_QueryInterface() specifically, but in general QueryInterface() should set *ppvObj to NULL on failure.

1 0

Re: wininet: InternetGetConnectedStateExW must return TRUE for success (try 2)
by Henri Verbeet 30 Jan '14

30 Jan '14

On 29 January 2014 23:01, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > Citavi relies on == TRUE comparison so return TRUE instead of != FALSE > I think that in general this kind of change benefits from a comment indicating that the extra compare is on purpose, mostly to avoid someone from removing it again in the future.

2 1

Re: [2/2] kernel32: Don't leak extrabuf when HeapReAlloc fails
by Henri Verbeet 30 Jan '14

30 Jan '14

On 29 January 2014 23:41, André Hentschel <nerv(a)dawncrow.de> wrote: > - extrabuf = HeapReAlloc( GetProcessHeap(), 0, extrabuf, ebufsize ) ; > + if (newbuf = HeapReAlloc( GetProcessHeap(), 0, extrabuf, ebufsize )) > + extrabuf = newbuf; > + else > + break; This will introduce a warning: computername.c: In function ‘dns_gethostbyname’: computername.c:90:9: warning: suggest parentheses around assignment used as truth value [-Wparentheses] I happen to think + if (!(newbuf = HeapReAlloc( GetProcessHeap(), 0, extrabuf, ebufsize ))) + break; + extrabuf = newbuf; would be slightly nicer anyway.

1 0