wine-devel

wine-devel@winehq.org

9 participants
84431 discussions

Wine compatibility checking tool
by robert lippmann 10 Mar '25

10 Mar '25

Hi all, I had an idea for something that might be useful and wanted to know everyone’s thoughts. Basically, create a program that will take a Windows executable/dll, find all the imports and check Wine’s .spec files to see if the imports are stubs or don’t exist. Obviously could also go recursive through imports of other dlls down to the win32 sdk level too. It might help figure out some “why is this program crashing” issues. Thoughts? Rob

4 5

Wine staging 10.3 release
by Alistair Leslie-Hughes 08 Mar '25

08 Mar '25

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 10.3 (347 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * oleaut32/tests: Add some tests for loading and saving EMF using IPicture interface. * oleaut32: Add support for loading and saving EMF to IPicture interface. * oleaut32: Implement a better stub for IPicture::SaveAsFile. * oleaut32: Implement SaveAsFile for PICTYPE_ENHMETAFILE. * d3dx9_36: Filter out D3DCompile warning messages that are not present with D3DCompileShader. * setupapi: Rewrite DiskSpaceList logic using lists. * setupapi: Implement SetupAddToDiskSpaceList. * setupapi: Implement SetupQueryDrivesInDiskSpaceList. * setupapi: Ignore deletion of added files in SetupAddToDiskSpaceList. * setupapi: ImplementSetupAddSectionToDiskSpaceList. * setupapi: Implement SetupAddInstallSectionToDiskSpaceList. Removed (No longer required). * server-Realtime_Priority Added: * [21940] msxml: Improve support for the whitespace value. Updated: * vkd3d-latest * d3dx9_36-DDS Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. * Suggest patches to be included in staging. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

wine-9.0.1-rc1 Available
by Michael Stefaniuc 02 Mar '25

02 Mar '25

Hello, I have pushed wine-9.0.1-rc1 (0186f5408a91049ca9fe564bac36aa7eee718cc3) with tag to https://gitlab.winehq.org/mstefani/wine/-/tree/oldstable https://people.redhat.com/mstefani/wine/stable/ And created the merge request https://gitlab.winehq.org/wine/wine/-/merge_requests/7462 But more importantly I have created the MR to remove myself as maintainer of Stable: https://gitlab.winehq.org/wine/wine/-/merge_requests/7463 In the the last two years I didn't have the time for Wine. So it is better to make space for somebody else. What's new in this release: - Various bug fixes. ---------------------------------------------------------------- ### Bugs fixed in 9.0.1 (total 74): - #25207 SHFileOperation does not create new directory on FO_MOVE - #33050 FDM (Free Download Manager) crashes with page fault when any remote FTP directory opened - #44863 Performance regression in Prince of Persia 3D - #46070 Basemark Web 3.0 Desktop Launcher crashes - #46074 Visio 2013 crashes with unimplemented function msvcr100.dll.??0_ReaderWriterLock@details@Concurrency@@QAE@XZ - #48110 Multiple .NET 4.x applications need TaskService::ConnectedUser property (Toad for MySQL Freeware 7.x, Microsoft Toolkit from MS Office 2013) - #49089 nProtect Anti-Virus/Spyware 4.0 'tkpl2k64.sys' crashes on unimplemented function 'fltmgr.sys.FltBuildDefaultSecurityDescriptor' - #49703 Ghost Recon fails to start - #49877 Minecraft Education Edition shows error during install: Fails to create scheduled task - #51285 The bmpcoreimage test in user32:cursoricon fails on most Windows versions - #51599 cmd.exe incorrectly parses an all-whitespace line followed by a closing parenthesis - #51813 python fatal error redirecting stdout to file - #51957 Program started via HKLM\Software\Microsoft\Windows\CurrentVersion\App Paths should also be started if extension ".exe" is missing - #52399 SIMATIC WinCC V15.1 Runtime installer: SeCon tool fails with error 5 while trying to create 'C:\\windows\Security\\SecurityController' (needs '%windir%\\security') - #52622 windows-rs 'lib' test crashes on unimplemented function d3dcompiler_47.dll.D3DCreateLinker - #52879 ESET SysInspector 1.4.2.0 crashes on unimplemented function wevtapi.dll.EvtCreateRenderContext - #53934 __unDName fails to demangle a name - #54759 Notepad++: slider of vertical scrollbar is too small for long files - #55000 wineserver crashes below save_all_subkeys after RegUnLoadKey - #55268 user32:cursoricon - LoadImageA() fails in test_monochrome_icon() on Windows 8+ - #55282 Flutter SDK can't find "aapt" program (where.exe is a stub) - #55421 Fallout Tactics launcher has graphics glitches - #55619 VOCALOID AI Shared Editor v.6.1.0 crashes with System.Management.ManagementObject object construction - #55724 mfmediaengine:mfmediaengine sometimes gets a threadpool assertion in Wine - #55765 The 32-bit d2d1:d2d1 frequently crashes on the GitLab CI - #55810 Finding Nemo (Steam): window borders gone missing (virtual desktop) - #55876 Acrom Controller Updater broken due to oleaut32 install - #55883 SpeedWave can't draw Window, needs oleaut32.OleLoadPictureFile(). - #55897 cpython 3.12.0 crashes due to unimplemented CopyFile2 - #55945 KakaoTalk crashes when opening certain profiles after calling GdipDrawImageFX stub - #55997 Dolphin Emulator crashes from 5.0-17264 - #56054 Microsoft Safety Scanner crashes on exit on unimplemented function tbs.dll.GetDeviceIDString - #56062 unimplemented function mgmtapi.dll.SnmpMgrOpen - #56078 LibreOffice 7.6.4 crashes on unimplemented function msvcp140_2.dll.__std_smf_hypot3 - #56093 msys/pacman: fails with "fixup_mmaps_after_fork: VirtualQueryEx failed" - #56122 LANCommander won't start, prints "error code 0x8007046C" (ERROR_MAPPED_ALIGNMENT) - #56133 explorer.exe: Font leak when painting - #56135 Dictionnaire Hachette Multimédia Encyclopédique 98 crashes on start - #56139 scrrun: Dictionary does not allow storing at key Undefined - #56168 dbghelp hits assertion in stabs_pts_read_type_def - #56174 Forza Horizon 4 crashes with concrt140.dll.?_Confirm_cancel@_Cancellation_beacon@details@Concurrency@@QEAA_NXZ - #56195 Device name inconsistent casing between GetRawInputDeviceInfo and PnP - #56223 winedbg: crashes after loading gecko debug information - #56235 Windows Sysinternals Process Explorer 17.05 crashes showing Threads property page. - #56243 ShowSystray registry key was removed without alternative - #56244 SplashTop RMM client for Atera crashes on unimplemented function shcore.dll.RegisterScaleChangeNotifications - #56256 Windows Sysinternals Process Explorer 17.05 shows incomplete user interface (32-bit). - #56265 Epic Games Launcher 15.21.0 calls unimplemented function cfgmgr32.dll.CM_Get_Device_Interface_PropertyW - #56271 Free Download Manager no longer works after it updated (stuck at 100% CPU, no visible window) - #56309 Across Lite doesn't show the letters properly when typing - #56334 Page fault when querying dinput8_a_EnumDevices - #56357 Zero sized writes using WriteProcessMemory succeed on Windows, but fail on Wine. - #56361 Geovision Parashara's Light (PL9.exe) still crashes in wine - #56367 Tomb Raider 3 GOG crashes at start - #56369 Advanced IP Scanner crashes on unimplemented function netapi32.dll.NetRemoteTOD - #56372 musl based exp2() gives very inaccurate results on i686 - #56400 SSPI authentication does not work when connecting to sql server - #56434 WScript.Network does not implement UserName, ComputerName, and UserDomain properties - #56493 PresentationFontCache.exe crashes during .Net 3.51 SP1 installation - #56498 Incorrect substring expansion for magic variables - #56503 CryptStringToBinary doesn't adds CR before pad bytes in some cases - #56554 ON1 photo raw installs but wont run the application - #56579 Setupapi fails to read correct class GUID and name from INF file containing %strkey% tokens - #56582 vb3 combobox regression: single click scrolls twice - #56598 Calling [vararg] method via ITypeLib without arguments via IDispatch fails - #56599 HWMonitor 1.53 needs unimplemented function pdh.dll.PdhConnectMachineA - #56609 vcrun2008 fails to install - #56653 GetLogicalProcessorInformation can be missing Cache information - #56666 BExAnalyzer from SAP 7.30 does not work correctly - #56730 Access violation in riched20.dll when running EditPad - #56755 White textures in EverQuest (Unsupported Conversion in windowscodec/convert.c) - #56763 Firefox 126.0.1 crashes on startup - #56781 srcrrun: Dictionary setting item to object fails - #56871 The 32-bit wpcap program is working abnormally ### Changes since 9.0: Alex Henrie (10): tbs: Add GetDeviceIDString stub. include: Add mgmtapi.h and LPSNMP_MGR_SESSION. mgmtapi: AddSnmpMgrOpen stub. msvcp140_2: Implement __std_smf_hypot3. where: Implement search with default options. explorer: Fix font handle leaks in virtual desktop. pdh: Add PdhConnectMachineA stub. ntdll/tests: Delete the WineTest registry key when the tests finish. ntdll/tests: Rewrite the RtlQueryRegistryValues tests and add more of them. ntdll: Succeed in RtlQueryRegistryValues on direct query of nonexistent value. Alexandre Julliard (15): winsta: Start time is an input parameter in WinStationGetProcessSid. oleaut32: Fix IDispatch::Invoke for vararg functions with empty varargs. ntdll: Add default values for cache parameters. secur32/tests: Update count for new winehq.org certificate. gitlab: Add 'build' tag on Linux build jobs. gitlab: Remove make -j options. dnsapi/tests: Update tests for winehq.org DNS changes. urlmon/tests: Fix a test that fails after WineHQ updates. wininet/tests: Update issuer check for winehq.org certificate. urlmon/tests: Skip test if ftp connection fails. user32/tests: Fix some sysparams results on recent Windows. dnsapi/tests: Update DNS names for the new test.winehq.org server. wininet/tests: Update certificate for the new test.winehq.org server. secur32/tests: Update expected results for the new test.winehq.org server. winhttp/tests: Allow some more notifications for the new test.winehq.org server. Alistair Leslie-Hughes (3): fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor. fltmgr.sys: Create import library. ntoskrnl/tests: Add FltBuildDefaultSecurityDescriptor test. Andrew Nguyen (2): oleaut32: Bump version resource to Windows 10. ddraw: Reserve extra space in the reference device description buffer. Bartosz Kosiorek (2): gdiplus/tests: Add GdipDrawImageFX tests except effects or attributes. gdiplus: Partially implement GdipDrawImageFX. Benjamin Mayes (1): windowscodecs: Add conversions from PixelFormat32bppBGRA->PixelFormat16bppBGRA5551. Bernhard Übelacker (10): server: Avoid unloading of HKU .Default registry branch. server: Allow VirtualQueryEx on "limited" handle. wing32: Add tests. wing32: Avoid crash in WinGGetDIBPointer when called with NULL bitmap info. dbghelp: Return early if HeapAlloc failed. ntdll: Fix structure layout in RtlQueryProcessDebugInformation for 64-bit. wininet: Add missing assignment of return value. wininet: Avoid crash in InternetCreateUrl with scheme unknown. cmd: Handle lines with just spaces in bracket blocks. cmd: Avoid execution if block misses closing brackets. Dmitry Timoshkov (4): oleaut32: Do not reimplement OleLoadPicture in OleLoadPicturePath. oleaut32: Factor out stream creation from OleLoadPicturePath. oleaut32: Implement OleLoadPictureFile. kerberos: Allocate memory for the output token if requested. Eric Pouech (4): dbghelp: Support redefinition of a range statement. server: Allow 0-write length in WriteProcessMemory(). cmd: Add test for substring handling in 'magic' variable expansion. cmd: Fix substring expansion for 'magic' variables. Esme Povirk (1): gdiplus: Prefer Tahoma for generic sans serif font. Fabian Maurer (11): win32u: Factor out scroll timer handling. win32u: Only set scroll timer if it's not running. oleaut32: Add test for invoking a dispatch get-only property with DISPATCH_PROPERTYPUT. oleaut32: Handle cases where invoking a get-only property with INVOKE_PROPERTYPUT returns DISP_E_BADPARAMCOUNT. riched20: In para_set_fmt protect against out of bound cTabStop values. mmdevapi/tests: Add tests for IAudioSessionControl2 GetDisplayName / SetDisplayName. mmdevapi/tests: Add tests for IAudioSessionControl2 GetIconPath / SetIconPath. mmdevapi/tests: Add tests for IAudioSessionControl2 GetGroupingParam / SetGroupingParam. mmdevapi: Implement IAudioSessionControl2 GetDisplayName / SetDisplayName. mmdevapi: Implement IAudioSessionControl2 GetIconPath / SetIconPath. mmdevapi: Implement IAudioSessionControl2 GetGroupingParam SetGroupingParam. Felix Münchhalfen (2): ntdll: Use pagesize alignment if MEM_REPLACE_PLACEHOLDER is set in flags of NtMapViewOfSection(Ex). kernelbase/tests: Add a test for MapViewOfFile3 with MEM_REPLACE_PLACEHOLDER. Hans Leidekker (12): wbemprox: Protect tables with a critical section. wbemprox: Handle implicit property in object path. netprofm: Support NLM_ENUM_NETWORK flags. netprofm: Set return pointer to NULL in networks_enum_Next(). msi: Install global assemblies before running deferred custom actions. msi: Install global assemblies after install custom actions and before commit custom actions. wpcap: Handle different layout of the native packet header structure on 32-bit. winhttp/tests: Fix test failures introduced by the server upgrade. secur32: Handle GNUTLS_MAC_AEAD. secur32/tests: Switch to TLS 1.2 for connections to test.winehq.org. secur32/tests: Mark some test results as broken on old Windows versions. crypt32/tests: Fix a test failure. Helix Graziani (1): cfgmgr32: Add CM_Get_Device_Interface_PropertyW stub. Jinoh Kang (4): include: Add definition for FILE_STAT_INFORMATION. ntdll/tests: Add tests for NtQueryInformationFile FileStatInformation. ntdll: Implement NtQueryInformationFile FileStatInformation. kernelbase: Replace FileAllInformation with FileStatInformation in GetFileInformationByHandle(). Kartavya Vashishtha (1): kernelbase: Implement CopyFile2(). Louis Lenders (3): shcore: Add stub for RegisterScaleChangeNotifications. shell32: Try appending .exe when looking up an App Paths key. wmic: Support interactive mode and piped commands. Martin Storsjö (1): musl: Fix limiting the float precision in intermediates. Michael Stefaniuc (2): gitlab: Do not run the build script on each commit. tools: Get the ANNOUNCE bug list from the stable-notes git notes. Nicholas Tay (1): win32u: Preserve rawinput device instance ID case in add_device(). Nikolay Sivov (10): scrrun/dictionary: Add support for hashing VT_EMPTY keys. scrrun/dictionary: Add support for hashing VT_NULL keys. scrrun/dictionary: Handle VT_EMPTY/VT_NULL keys. wshom/network: Use TRACE() for implemented method. wshom/network: Implement GetTypeInfo(). wshom/network: Implement ComputerName() property. wshom/network: Check pointer argument in get_UserName(). wshom/network: Implement UserDomain property. d2d1: Fix a double free on error path (Valgrind). scrrun/dictionary: Implement putref_Item() method. Paul Gofman (4): explorer: Don't pop start menu on "minimize all windows" systray command. explorer: Don't pop start menu on "undo minimize all windows" systray command. winhttp: Always return result at once if available in WinHttpQueryDataAvailable(). winhttp: Always return result at once if available in WinHttpReadData(). Peter Johnson (1): wined3d: Added missing GTX 3080 & 1070M. Piotr Caban (5): msvcp140_2: Fix i386 export names. msvcp140_2: Implement __std_smf_hypot3f. msvcp140_t/tests: Add __std_smf_hypot3 tests. concrt140: Add _Cancellation_beacon::_Confirm_cancel() implementation. msvcrt: Store _unDName function parameter backreferences in parsed_symbol structure. Roland Häder (1): wined3d: Added missing GTX 1650. Rémi Bernon (9): dinput/tests: Add some IRawGameController2 interface tests. windows.gaming.input: Stub IRawGameController2 interface. explorer: Restore a per-desktop ShowSystray registry setting. secur32/tests: Update the tests to expect HTTP/2 headers. imm32/tests: Add todo_himc to some ImmTranslateMessage expected calls. urlmon/tests: Expect "Upgrade, Keep-Alive" connection string. user32/tests: Add flaky_wine to some SetActiveWindow tests. wininet: Parse multi-token Connection strings for Keep-Alive. user32/tests: Fix cursoricon tests on recent Windows versions. Sam Joan Roque-Worcel (1): win32u: Make SCROLL_MIN_THUMB larger. Santino Mazza (1): crypt32: Fix CryptBinaryToString not adding a separator. Tim Clem (1): gitlab: Update configuration for the new Mac runner. Tuomas Räsänen (2): setupapi/tests: Add tests for reading INF class with %strkey% tokens. setupapi: Use INF parser to read class GUID and class name. Vijay Kiran Kamuju (10): msvcr100: Add _ReaderWriterLock constructor implementation. wine.inf: Create security directory. concrt140: Add stub for _Cancellation_beacon::_Confirm_cancel(). taskschd: Implement ITaskService_get_ConnectedUser. taskschd: Return success from Principal_put_RunLevel. taskschd: Implement TaskService_get_ConnectedDomain. d3dcompiler: Add D3DCreateLinker stub. netapi32: Add NetRemoteTOD stub. mscms: Add stub for WcsGetDefaultColorProfile. wevtapi: Add stub EvtCreateRenderContext(). Zebediah Figura (4): shell32/tests: Remove obsolete workarounds from test_move(). ddraw: Use system memory for version 4 vertex buffers. ddraw: Upload only the used range of indices in d3d_device7_DrawIndexedPrimitive(). ddraw/tests: Test GetVertexBufferDesc(). Zhenbo Li (1): shell32: Create nonexistent destination directories in FO_MOVE. Zhiyi Zhang (6): include: Rename DF_WINE_CREATE_DESKTOP to DF_WINE_VIRTUAL_DESKTOP. server: Inherit internal desktop flags when creating desktops. rtworkq: Avoid closing a thread pool object while its callbacks are running. rtworkq: Avoid possible scenarios that an async callback could be called twice. user32/tests: Add some ReleaseCapture() tests. win32u: Only send mouse input in ReleaseCapture() when a window is captured. bye michael

1 0

Re: Apple Silicon compilation
by Donald Smith 27 Feb '25

27 Feb '25

I’ve also been playing with building wine on Apple Silicon (Sequoia), and though I was also able to successfully build for x86_86 (with Rosetta 2), it seems that I’m having issues with fonts that are basically making running anything with a GUI impossible. I can run cmd.exe without a problem, but things like explorer and notepad either don’t show up at all or open with an essentially blank window. If I configure and build with freetype2, I get repeated errors about not being able to find the library even though I have it installed: Wine cannot find the FreeType font library. To enable Wine to use TrueType fonts please install a version of FreeType greater than or equal to 2.0.5. http://www.freetype.org Then, eventually the following error: 0140:err:syslink:SYSLINK_SetFont Failed to create link font! Configuring without freetype still results in the above SYSLINK_SetFont error. Attempts after the I’ve found a few vague posts online from long ago about needing the 32-bit freetype2 libraries, but is that even a possibility anymore since Apple removed support for 32-bit code? I’ve also come across hints that System Integrity Protection might be getting in the way somehow, but I’m really not familiar with the details of how that works. In any case, I have just set up a spare Linux box so I can hopefully have a smoother time getting started on contributing, but I was excited about working on this in a macOS environment. After seeing Rob’s post, I figured I would chime in just in case anybody has any tips. Forgive me if I am just way off in the weeds; it has been a long time since I've compiled any C code on Linux, much less on macOS. -Don > > From: robert lippmann <robert.lippmann.development(a)gmail.com> > Subject: Apple Silicon compilation > Date: February 23, 2025 at 7:55:59 PM EST > To: wine-devel(a)winehq.org > Reply-To: wine-devel(a)winehq.org > > > Hi all, > > I tried to update the wiki to document how to compile Wine on Apple Silicon, but I’m not sure if it went through. > > Basically, you need to add lld (which pulls in llvm) in addition to the other build dependencies > So: > > brew install lld > > Then: > PATH=`brew —prefix llvm`/bin:`brew —prefix bison`/bin:$PATH > > Then everything compiles. > > You probably don’t even need Xcode. And you probably should have Rosetta2 installed. > > I haven’t actually been able to get it to run yet, though… > > — Rob >

1 0

Question about `Avoid const strarray pointers in all functions' patch
by Mitch Wilkinson 27 Feb '25

27 Feb '25

2 1

Wine staging 10.2 release
by Alistair Leslie-Hughes 22 Feb '25

22 Feb '25

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 10.2 (350 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * vbscript: implement Join() * shdocvw: Check precisely ParseURLFromOutsideSourceX returned values in tests and make code clearer about that. * oleaut32: Fix logic for deciding whether type description follows the name * oleaut32: Implement decoding of SLTG help strings. * oleaut32: Add support for decoding SLTG function help strings. * oleaut32: Add support for decoding SLTG variable help strings. * oleaut32: OleLoadPicture should create a DIB section for a being loaded bitmap. * oleaut32: Make OleLoadPicture load DIBs using WIC decoder. * gdiplus: Add support for more image color formats. * gdiplus/tests: Add some tests for loading TIFF images in various color formats. Removed (No longer required). * None Added: * [52568] ws_ws2: Support for AF_UNIX sockets. Updated: * vkd3d-latest * win32u-NtGdiExtTextOutW-rotation Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. * Suggest patches to be included in staging. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

Ask for help
by 谢威 21 Feb '25

21 Feb '25

Is there any development documentation related to wine wow64 syscall and unixcall.

1 0

Re: [PATCH] ntsync: Check wait count based on byte size.
by Elizabeth Figura 20 Feb '25

20 Feb '25

On Wednesday, 19 February 2025 08:25:27 CST Greg Kroah-Hartman wrote: > On Tue, Feb 18, 2025 at 06:19:20PM -0600, Elizabeth Figura wrote: > > GCC versions below 13 incorrectly detect the copy size as being static and too > > small to fit in the "fds" array. Work around this by explicitly calculating the > > size and returning EINVAL based on that, instead of based on the object count. > > > > Reported-by: kernel test robot <lkp(a)intel.com> > > Closes: https://lore.kernel.org/oe-kbuild-all/202502072019.LYoCR9bF-lkp@intel.com/ > > Suggested-by: Arnd Bergmann <arnd(a)arndb.de> > > > > -- > > > > Suggested-by as per Arnd's request, but the only thing I changed was preserving > > array_size() [as noted by Geert in the linked thread]. I tested and found no > > regressions. > > You forgot to sign-off on this commit :( > > Can you resend it please with that fixed? Done, thanks. I used to have format.signOff=true but lost that somewhere...

1 0

[PATCH v2] ntsync: Check wait count based on byte size.
by Elizabeth Figura 20 Feb '25

20 Feb '25

GCC versions below 13 incorrectly detect the copy size as being static and too small to fit in the "fds" array. Work around this by explicitly calculating the size and returning EINVAL based on that, instead of based on the object count. Reported-by: kernel test robot <lkp(a)intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202502072019.LYoCR9bF-lkp@intel.com/ Suggested-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Elizabeth Figura <zfigura(a)codeweavers.com> -- Suggested-by as per Arnd's request, but the only thing I changed was preserving array_size() [as noted by Geert in the linked thread]. I tested and found no regressions. v2: Add missing sign-off --- drivers/misc/ntsync.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c index 586b86243e1d..24cb2f71186a 100644 --- a/drivers/misc/ntsync.c +++ b/drivers/misc/ntsync.c @@ -873,6 +873,7 @@ static int setup_wait(struct ntsync_device *dev, { int fds[NTSYNC_MAX_WAIT_COUNT + 1]; const __u32 count = args->count; + size_t size = array_size(count, sizeof(fds[0])); struct ntsync_q *q; __u32 total_count; __u32 i, j; @@ -880,15 +881,14 @@ static int setup_wait(struct ntsync_device *dev, if (args->pad || (args->flags & ~NTSYNC_WAIT_REALTIME)) return -EINVAL; - if (args->count > NTSYNC_MAX_WAIT_COUNT) + if (size >= sizeof(fds)) return -EINVAL; total_count = count; if (args->alert) total_count++; - if (copy_from_user(fds, u64_to_user_ptr(args->objs), - array_size(count, sizeof(*fds)))) + if (copy_from_user(fds, u64_to_user_ptr(args->objs), size)) return -EFAULT; if (args->alert) fds[count] = args->alert; -- 2.47.2

1 1

[PATCH] ntsync: Check wait count based on byte size.
by Elizabeth Figura 19 Feb '25

19 Feb '25

GCC versions below 13 incorrectly detect the copy size as being static and too small to fit in the "fds" array. Work around this by explicitly calculating the size and returning EINVAL based on that, instead of based on the object count. Reported-by: kernel test robot <lkp(a)intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202502072019.LYoCR9bF-lkp@intel.com/ Suggested-by: Arnd Bergmann <arnd(a)arndb.de> -- Suggested-by as per Arnd's request, but the only thing I changed was preserving array_size() [as noted by Geert in the linked thread]. I tested and found no regressions. --- drivers/misc/ntsync.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c index 586b86243e1d..24cb2f71186a 100644 --- a/drivers/misc/ntsync.c +++ b/drivers/misc/ntsync.c @@ -873,6 +873,7 @@ static int setup_wait(struct ntsync_device *dev, { int fds[NTSYNC_MAX_WAIT_COUNT + 1]; const __u32 count = args->count; + size_t size = array_size(count, sizeof(fds[0])); struct ntsync_q *q; __u32 total_count; __u32 i, j; @@ -880,15 +881,14 @@ static int setup_wait(struct ntsync_device *dev, if (args->pad || (args->flags & ~NTSYNC_WAIT_REALTIME)) return -EINVAL; - if (args->count > NTSYNC_MAX_WAIT_COUNT) + if (size >= sizeof(fds)) return -EINVAL; total_count = count; if (args->alert) total_count++; - if (copy_from_user(fds, u64_to_user_ptr(args->objs), - array_size(count, sizeof(*fds)))) + if (copy_from_user(fds, u64_to_user_ptr(args->objs), size)) return -EFAULT; if (args->alert) fds[count] = args->alert; -- 2.47.2

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel