v4l2: v4l2_camera_proxy: Prevent ioctl sign-extensions
Handling ioctl's within applications is often wrapped with a helper such as xioctl. Unfortunately, there are many instances of xioctl which incorrectly handle the correct size of the ioctl request. This leads to incorrect sign-extension of ioctl's which have bit-31 set, and can cause values to be passed into the libcamera's v4l2 adaptation layer which no longer represent the true IOCTL code. Match the implementation of the Linux kernel and ensure that only 32 bits of the ioctl request are used by assigning to an unsigned int. Link: https://github.com/Motion-Project/motion/discussions/1636 Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
parent
22cc8bc25d
commit
f7a9f14156
1 changed files with 11 additions and 1 deletions
|
@ -778,10 +778,20 @@ const std::set<unsigned long> V4L2CameraProxy::supportedIoctls_ = {
|
||||||
VIDIOC_STREAMOFF,
|
VIDIOC_STREAMOFF,
|
||||||
};
|
};
|
||||||
|
|
||||||
int V4L2CameraProxy::ioctl(V4L2CameraFile *file, unsigned long request, void *arg)
|
int V4L2CameraProxy::ioctl(V4L2CameraFile *file, unsigned long longRequest, void *arg)
|
||||||
{
|
{
|
||||||
MutexLocker locker(proxyMutex_);
|
MutexLocker locker(proxyMutex_);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The Linux Kernel only processes 32 bits of an IOCTL.
|
||||||
|
*
|
||||||
|
* Prevent unexpected sign-extensions that could occur if applications
|
||||||
|
* use a signed int for the ioctl request, which would sign-extend to
|
||||||
|
* an incorrect value for unsigned longs on 64 bit architectures by
|
||||||
|
* explicitly casting as an unsigned int here.
|
||||||
|
*/
|
||||||
|
unsigned int request = longRequest;
|
||||||
|
|
||||||
if (!arg && (_IOC_DIR(request) & _IOC_WRITE)) {
|
if (!arg && (_IOC_DIR(request) & _IOC_WRITE)) {
|
||||||
errno = EFAULT;
|
errno = EFAULT;
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue