diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2017-03-10 19:10:54 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-03-10 19:22:53 +0100 |
| commit | b6573da139ecbee6f2c77392b51266d4521d50ac (patch) | |
| tree | df161bc74a23fc597b942f26160fb0157770d315 /drivers/input/rmi4 | |
| parent | Input: i8042 - add noloop quirk for Dell Embedded Box PC 3000 (diff) | |
| download | linux-b6573da139ecbee6f2c77392b51266d4521d50ac.tar.xz linux-b6573da139ecbee6f2c77392b51266d4521d50ac.zip | |
Input: synaptics-rmi4 - prevent null pointer dereference in f30
If the platform data has f30_data.disable set, f30 in rmi_f30_config()
might be null. Prevent a kernel oops by checking for non-null f30.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/rmi4')
| -rw-r--r-- | drivers/input/rmi4/rmi_f30.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/rmi4/rmi_f30.c b/drivers/input/rmi4/rmi_f30.c index 3422464af229..b8572b342dcb 100644 --- a/drivers/input/rmi4/rmi_f30.c +++ b/drivers/input/rmi4/rmi_f30.c @@ -170,6 +170,10 @@ static int rmi_f30_config(struct rmi_function *fn) rmi_get_platform_data(fn->rmi_dev); int error; + /* can happen if f30_data.disable is set */ + if (!f30) + return 0; + if (pdata->f30_data.trackstick_buttons) { /* Try [re-]establish link to F03. */ f30->f03 = rmi_find_function(fn->rmi_dev, 0x03); |