From patchwork Tue Jun 16 10:56:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 4042 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 359D360103 for ; Tue, 16 Jun 2020 12:56:50 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="f2sSYjgB"; dkim-atps=neutral Received: from jade.flets-east.jp (unknown [IPv6:2400:4051:61:600:2807:bdfa:f6a:8e53]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A855EF9; Tue, 16 Jun 2020 12:56:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592305009; bh=AyJUpuO7xIQEbVwetyq8zpT70KS2EuanO7DTVYdpNP4=; h=From:To:Cc:Subject:Date:From; b=f2sSYjgB/hveJtnBh/gfz0nZ/kYW92QegX1pBQReLhAd0sBjJGJpRlFDP0x45XATO +LnWvl6W0j5yjjIDFunTFmskuBh3cizhD6hIxL/992H9V/LIszGyzUifuutGbD9D2G 76CaiBYaZBacy8lOT13og2NZfEmXvne2sjZ48F3k= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 16 Jun 2020 19:56:32 +0900 Message-Id: <20200616105633.57717-1-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] v4l2: v4l2_compat: Intercept open64, openat64, and mmap64 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2020 10:56:50 -0000 Some applications (eg. Firefox, Google Chrome, Skype) use import open64, openat64, and mmap64 instead of their non-64 versions that we currently intercept. Intercept these calls as well. Signed-off-by: Paul Elder --- src/v4l2/meson.build | 1 + src/v4l2/v4l2_camera_proxy.cpp | 2 +- src/v4l2/v4l2_camera_proxy.h | 3 ++- src/v4l2/v4l2_compat.cpp | 29 ++++++++++++++++++++++++++++- src/v4l2/v4l2_compat_manager.cpp | 2 +- src/v4l2/v4l2_compat_manager.h | 5 +++-- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build index 0fb941e..f2e4aaf 100644 --- a/src/v4l2/meson.build +++ b/src/v4l2/meson.build @@ -15,6 +15,7 @@ v4l2_compat_cpp_args = [ # file operations, disable transparent large file support. '-U_FILE_OFFSET_BITS', '-D_FILE_OFFSET_BITS=32', + '-D_LARGEFILE64_SOURCE', '-fvisibility=hidden', ] diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 17477ab..59af209 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -75,7 +75,7 @@ void V4L2CameraProxy::close() } void *V4L2CameraProxy::mmap(void *addr, size_t length, int prot, int flags, - off_t offset) + __off64_t offset) { LOG(V4L2Compat, Debug) << "Servicing mmap"; diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h index 7c65c88..b5a9801 100644 --- a/src/v4l2/v4l2_camera_proxy.h +++ b/src/v4l2/v4l2_camera_proxy.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -28,7 +29,7 @@ public: int open(bool nonBlocking); void dup(); void close(); - void *mmap(void *addr, size_t length, int prot, int flags, off_t offset); + void *mmap(void *addr, size_t length, int prot, int flags, __off64_t offset); int munmap(void *addr, size_t length); int ioctl(unsigned long request, void *arg); diff --git a/src/v4l2/v4l2_compat.cpp b/src/v4l2/v4l2_compat.cpp index 2a9a176..ead36e6 100644 --- a/src/v4l2/v4l2_compat.cpp +++ b/src/v4l2/v4l2_compat.cpp @@ -38,6 +38,16 @@ LIBCAMERA_PUBLIC int open(const char *path, int oflag, ...) oflag, mode); } +LIBCAMERA_PUBLIC int open64(const char *path, int oflag, ...) +{ + mode_t mode = 0; + if (oflag & O_CREAT || oflag & O_TMPFILE) + extract_va_arg(mode_t, mode, oflag); + + return V4L2CompatManager::instance()->openat(AT_FDCWD, path, + oflag | O_LARGEFILE, mode); +} + /* _FORTIFY_SOURCE redirects open to __open_2 */ LIBCAMERA_PUBLIC int __open_2(const char *path, int oflag) { @@ -53,6 +63,16 @@ LIBCAMERA_PUBLIC int openat(int dirfd, const char *path, int oflag, ...) return V4L2CompatManager::instance()->openat(dirfd, path, oflag, mode); } +LIBCAMERA_PUBLIC int openat64(int dirfd, const char *path, int oflag, ...) +{ + mode_t mode = 0; + if (oflag & O_CREAT || oflag & O_TMPFILE) + extract_va_arg(mode_t, mode, oflag); + + return V4L2CompatManager::instance()->openat(dirfd, path, + oflag | O_LARGEFILE, mode); +} + LIBCAMERA_PUBLIC int __openat_2(int dirfd, const char *path, int oflag) { return openat(dirfd, path, oflag); @@ -69,7 +89,14 @@ LIBCAMERA_PUBLIC int close(int fd) } LIBCAMERA_PUBLIC void *mmap(void *addr, size_t length, int prot, int flags, - int fd, off_t offset) + int fd, __off_t offset) +{ + return V4L2CompatManager::instance()->mmap(addr, length, prot, flags, + fd, offset); +} + +LIBCAMERA_PUBLIC void *mmap64(void *addr, size_t length, int prot, int flags, + int fd, __off64_t offset) { return V4L2CompatManager::instance()->mmap(addr, length, prot, flags, fd, offset); diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index 56533c4..f928760 100644 --- a/src/v4l2/v4l2_compat_manager.cpp +++ b/src/v4l2/v4l2_compat_manager.cpp @@ -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) diff --git a/src/v4l2/v4l2_compat_manager.h b/src/v4l2/v4l2_compat_manager.h index 14338a5..baf23ae 100644 --- a/src/v4l2/v4l2_compat_manager.h +++ b/src/v4l2/v4l2_compat_manager.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -30,7 +31,7 @@ public: using close_func_t = int (*)(int fd); using ioctl_func_t = int (*)(int fd, unsigned long request, ...); using mmap_func_t = void *(*)(void *addr, size_t length, int prot, - int flags, int fd, off_t offset); + int flags, int fd, __off64_t offset); using munmap_func_t = int (*)(void *addr, size_t length); openat_func_t openat; @@ -51,7 +52,7 @@ public: int dup(int oldfd); int close(int fd); void *mmap(void *addr, size_t length, int prot, int flags, - int fd, off_t offset); + int fd, __off64_t offset); int munmap(void *addr, size_t length); int ioctl(int fd, unsigned long request, void *arg); From patchwork Tue Jun 16 10:56:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 4043 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 275E660103 for ; Tue, 16 Jun 2020 12:56:52 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="d3odiuhH"; dkim-atps=neutral Received: from jade.flets-east.jp (unknown [IPv6:2400:4051:61:600:2807:bdfa:f6a:8e53]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 96956F9; Tue, 16 Jun 2020 12:56:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592305011; bh=B+xZnD39s/MFSH130yxagRP+sRVFl6+vwgXpUMBW8ts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d3odiuhHgqb4RRPen4s8uAdr1wsZNsF97zHFbCTDIljRDb3KI46nQRX91ubdsh6Qi cOpEbFs1lXBCpBf2IbqzAtlBj9lTR1uspxcuC1ULpapBiPjwynUf9B5ATrnHWKu8rv Da+vgbBqVL87WBWgkFN5s11SfUJhCKEOo4BqkVhY= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 16 Jun 2020 19:56:33 +0900 Message-Id: <20200616105633.57717-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616105633.57717-1-paul.elder@ideasonboard.com> References: <20200616105633.57717-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] v4l2: v4l2_compat_manager: Use openat64 and mmap64 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2020 10:56:52 -0000 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. Signed-off-by: Paul Elder --- src/v4l2/v4l2_compat_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index f928760..9298c0f 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"); }