NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: v4l2_device, v4l2_videodevice: call open system call directly

Browse source 
We are preparing to integrate the V4L2 adaptation layer, which will
intercept open() calls (among others) via LD_PRELOAD. To prevent
libcamera's own open() calls from being intercepted, replace them with a
direct syscall.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Paul Elder 2019-12-06 04:09:32 -05:00
parent 4910ff05c0
commit 58a19b9d56
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libcamera/v4l2_device.cpp
View file

@ -11,6 +11,7 @@
#include <iomanip> #include <iomanip>
#include <string.h> #include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/syscall.h>
#include <unistd.h> #include <unistd.h>
#include "log.h" #include "log.h"
@ -75,7 +76,7 @@ int V4L2Device::open(unsigned int flags)
return -EBUSY; return -EBUSY;
} }
int ret = ::open(deviceNode_.c_str(), flags); int ret = syscall(SYS_openat, AT_FDCWD, deviceNode_.c_str(), flags);
if (ret < 0) { if (ret < 0) {
ret = -errno; ret = -errno;
LOG(V4L2, Error) << "Failed to open V4L2 device: " LOG(V4L2, Error) << "Failed to open V4L2 device: "

4
src/libcamera/v4l2_videodevice.cpp
View file

@ -13,6 +13,7 @@
#include <string.h> #include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/syscall.h>
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include <vector> #include <vector>
@ -1426,7 +1427,8 @@ int V4L2M2MDevice::open()
* as the V4L2VideoDevice::open() retains a handle by duplicating the * as the V4L2VideoDevice::open() retains a handle by duplicating the
* fd passed in. * fd passed in.
*/ */
fd = ::open(deviceNode_.c_str(), O_RDWR | O_NONBLOCK); fd = syscall(SYS_openat, AT_FDCWD, deviceNode_.c_str(),
O_RDWR | O_NONBLOCK);
if (fd < 0) { if (fd < 0) {
ret = -errno; ret = -errno;
LOG(V4L2, Error) LOG(V4L2, Error)