From bf0e285246dcc9edf8442589a48b55510ee05db4 Mon Sep 17 00:00:00 2001 From: "Rustem Gimadutdinov (rgimad)" Date: Mon, 21 Jun 2021 21:38:42 +0000 Subject: [PATCH] fix previous git-svn-id: svn://kolibrios.org@8914 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/core/syscall.inc | 2 +- kernel/trunk/fs/fs_lfn.inc | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/kernel/trunk/core/syscall.inc b/kernel/trunk/core/syscall.inc index 37250ecec0..d78bd2516b 100644 --- a/kernel/trunk/core/syscall.inc +++ b/kernel/trunk/core/syscall.inc @@ -178,7 +178,7 @@ iglobal dd sys_posix ; posix support dd undefined_syscall ; 78-free dd undefined_syscall ; 79-free - dd syscall_fileSystemUnicode ; 80-File system interface for different encodings + dd fileSystemUnicode ; 80-File system interface for different encodings times 255 - ( ($-servetable2) /4 ) dd undefined_syscall dd sys_end ; -1-end application diff --git a/kernel/trunk/fs/fs_lfn.inc b/kernel/trunk/fs/fs_lfn.inc index 3d44bd642a..be38a520d0 100644 --- a/kernel/trunk/fs/fs_lfn.inc +++ b/kernel/trunk/fs/fs_lfn.inc @@ -90,21 +90,22 @@ image_of_ebx EQU esp+20 ; ret ; endp -syscall_fileSystemUnicode: -; in: ebx -> f.80 parameter structure - stdcall file_system_is_operation_safe, ebx - jnz @f +; syscall_fileSystemUnicode: ; with user pointer correctness checking +; ; in: ebx -> f.80 parameter structure +; stdcall file_system_is_operation_safe, ebx +; jnz @f - DEBUGF 1, "sysfn80 addr error\n" - mov dword [image_of_eax], ERROR_MEMORY_POINTER - ret -@@: - jmp fileSystemUnicode +; DEBUGF 1, "sysfn80 addr error\n" +; mov dword [image_of_eax], ERROR_MEMORY_POINTER +; ret +; @@: +; jmp fileSystemUnicode ; temporarily commented out cause acpi driver (drivers/devman) uses sysfn70 via 0x40 ; so because drivers it kernel space, pointer checking fails ; TODO solution: add filesystem functions without pointer checking to kernel exports ; and make the driver use them, not int 0x40 +; syscall_fileSystemUnicode commented out for the same reason ; syscall_file_system_lfn: ; with user pointer correctness checking ; ; in: ebx -> f.70 parameter structure ; stdcall file_system_is_operation_safe, ebx