From 1023107b6405266d480ce9c08cd82a30449a505b Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Mon, 8 Jun 2020 19:36:12 +0900 Subject: v4l2: v4l2_compat: Intercept open64, openat64, and mmap64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some applications (eg. Firefox, Google Chrome, Skype) use open64, openat64, and mmap64 instead of their non-64 versions that we currently intercept. Intercept these calls as well. _LARGEFILE64_SOURCE needs to be set so that the 64-bit symbols are available and not synonymous to the non-64-bit versions on 64-bit systems. Also, since we set _FILE_OFFSET_BITS to 32 to force the various open and mmap symbols that we export to not be the 64-bit versions, our dlsym to get the original open and mmap calls will not automatically be converted to their 64-bit versions. Since we intercept both 32-bit and 64-bit versions of open and mmap, we should be using the 64-bit version to service both. Fetch the 64-bit versions of openat and mmap directly. musl defines the 64-bit symbols as macros that are equivalent to the non-64-bit symbols, so we put compile guards that check if the 64-bit symbols are defined. Signed-off-by: Paul Elder Reviewed-by: Niklas Söderlund Tested-by: Laurent Pinchart # Compile with musl Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/v4l2/v4l2_compat_manager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/v4l2/v4l2_compat_manager.cpp') diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index 56533c4f..8da33164 100644 --- a/src/v4l2/v4l2_compat_manager.cpp +++ b/src/v4l2/v4l2_compat_manager.cpp @@ -39,11 +39,11 @@ void get_symbol(T &func, const char *name) V4L2CompatManager::V4L2CompatManager() : cm_(nullptr) { - get_symbol(fops_.openat, "openat"); + get_symbol(fops_.openat, "openat64"); get_symbol(fops_.dup, "dup"); get_symbol(fops_.close, "close"); get_symbol(fops_.ioctl, "ioctl"); - get_symbol(fops_.mmap, "mmap"); + get_symbol(fops_.mmap, "mmap64"); get_symbol(fops_.munmap, "munmap"); } @@ -200,7 +200,7 @@ int V4L2CompatManager::close(int fd) } void *V4L2CompatManager::mmap(void *addr, size_t length, int prot, int flags, - int fd, off_t offset) + int fd, off64_t offset) { V4L2CameraProxy *proxy = getProxy(fd); if (!proxy) -- cgit v1.2.1