Commit 7be469aa authored by Pan Zhang's avatar Pan Zhang Committed by Greg Kroah-Hartman

drivers/hid/hid-multitouch.c: fix a possible null pointer access.

[ Upstream commit 306d5acb ]

1002     if ((quirks & MT_QUIRK_IGNORE_DUPLICATES) && mt) {
1003         struct input_mt_slot *i_slot = &mt->slots[slotnum];
1004
1005         if (input_mt_is_active(i_slot) &&
1006             input_mt_is_used(mt, i_slot))
1007             return -EAGAIN;
1008     }

We previously assumed 'mt' could be null (see line 1002).

The following situation is similar, so add a judgement.
Signed-off-by: default avatarPan Zhang <zhangpan26@huawei.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1bc57916
...@@ -1007,7 +1007,7 @@ static int mt_process_slot(struct mt_device *td, struct input_dev *input, ...@@ -1007,7 +1007,7 @@ static int mt_process_slot(struct mt_device *td, struct input_dev *input,
tool = MT_TOOL_DIAL; tool = MT_TOOL_DIAL;
else if (unlikely(!confidence_state)) { else if (unlikely(!confidence_state)) {
tool = MT_TOOL_PALM; tool = MT_TOOL_PALM;
if (!active && if (!active && mt &&
input_mt_is_active(&mt->slots[slotnum])) { input_mt_is_active(&mt->slots[slotnum])) {
/* /*
* The non-confidence was reported for * The non-confidence was reported for
......
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