Commit 2168b416 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab

media: rc: ensure we do not read out of bounds

If rc_validate_filter() is called for CEC or XMP, then we would read
beyond the end of the array.
Suggested-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 86fe1ac0
...@@ -733,7 +733,7 @@ EXPORT_SYMBOL_GPL(rc_keydown_notimeout); ...@@ -733,7 +733,7 @@ EXPORT_SYMBOL_GPL(rc_keydown_notimeout);
static int rc_validate_filter(struct rc_dev *dev, static int rc_validate_filter(struct rc_dev *dev,
struct rc_scancode_filter *filter) struct rc_scancode_filter *filter)
{ {
static u32 masks[] = { static const u32 masks[] = {
[RC_TYPE_RC5] = 0x1f7f, [RC_TYPE_RC5] = 0x1f7f,
[RC_TYPE_RC5X_20] = 0x1f7f3f, [RC_TYPE_RC5X_20] = 0x1f7f3f,
[RC_TYPE_RC5_SZ] = 0x2fff, [RC_TYPE_RC5_SZ] = 0x2fff,
...@@ -757,6 +757,9 @@ static int rc_validate_filter(struct rc_dev *dev, ...@@ -757,6 +757,9 @@ static int rc_validate_filter(struct rc_dev *dev,
u32 s = filter->data; u32 s = filter->data;
enum rc_type protocol = dev->wakeup_protocol; enum rc_type protocol = dev->wakeup_protocol;
if (protocol >= ARRAY_SIZE(masks))
return -EINVAL;
switch (protocol) { switch (protocol) {
case RC_TYPE_NECX: case RC_TYPE_NECX:
if ((((s >> 16) ^ ~(s >> 8)) & 0xff) == 0) if ((((s >> 16) ^ ~(s >> 8)) & 0xff) == 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment