diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2007-01-30 18:25:41 -0800 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2007-01-30 18:25:41 -0800 |
| commit | 0b945b64fba3381dfc97c66722fe76193f0008d3 (patch) | |
| tree | e1e4420bd109756179544bda17819bee53d32ba1 /linux/drivers/media/video/cx25840/cx25840-core.c | |
| parent | 89d170b32b5620e4c3be940b825188493bd8f597 (diff) | |
| download | mediapointer-dvb-s2-0b945b64fba3381dfc97c66722fe76193f0008d3.tar.gz mediapointer-dvb-s2-0b945b64fba3381dfc97c66722fe76193f0008d3.tar.bz2 | |
Add checks for CAP_SYS_ADMIN to VIDIOC_DBG_G_REGISTER
From: Trent Piepho <xyzzy@speakeasy.org>
Before, root privileges were only needed to set hardware registers, not
to read them. On some hardware, reading from the wrong place at the
wrong time can hang the machine. So, to be consistent, root privileges
are required to read registers on all hardware.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index 9aaaa482d..b06553a1f 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -640,15 +640,6 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd, /* ioctls to allow direct access to the * cx25840 registers for testing */ case VIDIOC_DBG_G_REGISTER: - { - struct v4l2_register *reg = arg; - - if (reg->i2c_id != I2C_DRIVERID_CX25840) - return -EINVAL; - reg->val = cx25840_read(client, reg->reg & 0x0fff); - break; - } - case VIDIOC_DBG_S_REGISTER: { struct v4l2_register *reg = arg; @@ -657,7 +648,10 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd, return -EINVAL; if (!capable(CAP_SYS_ADMIN)) return -EPERM; - cx25840_write(client, reg->reg & 0x0fff, reg->val & 0xff); + if (cmd == VIDIOC_DBG_G_REGISTER) + reg->val = cx25840_read(client, reg->reg & 0x0fff); + else + cx25840_write(client, reg->reg & 0x0fff, reg->val & 0xff); break; } #endif |