Skip to contentSkip to conversation

platform/x86: huawei-wmi: Fix a possible NULL deref

PATCH In review Ayman Bagabas 2 participants 4 messages Dec 25, 2019 – Dec 27, 2019 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: huawei-wmi: Fix a possible NULL deref

We're iterating over a NULL terminated array.

Fixes 1ac9abeb2e5b ("platform/x86: huawei-wmi: Move to platform driver")
---
 drivers/platform/x86/huawei-wmi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/huawei-wmi.c +3 -3
index a2d846c4a7ee..42d461eeeff4 100644
@@ -784,13 +784,13 @@ static const struct wmi_device_id huawei_wmi_events_id_table[] = {
 static int huawei_wmi_probe(struct platform_device *pdev)
 {
 	const struct wmi_device_id *guid = huawei_wmi_events_id_table;
+	struct input_dev *idev = *huawei_wmi->idev;
 	int err;
 
 	platform_set_drvdata(pdev, huawei_wmi);
 	huawei_wmi->dev = &pdev->dev;
 
-	while (*guid->guid_string) {
-		struct input_dev *idev = *huawei_wmi->idev;
+	while (guid->guid_string) {
 
 		if (wmi_has_guid(guid->guid_string)) {
 			err = huawei_wmi_input_setup(&pdev->dev, guid->guid_string, &idev);
@@ -820,7 +820,7 @@ static int huawei_wmi_remove(struct platform_device *pdev)
 {
 	const struct wmi_device_id *guid = huawei_wmi_events_id_table;
 
-	while (*guid->guid_string) {
+	while (guid->guid_string) {
 		if (wmi_has_guid(guid->guid_string))
 			huawei_wmi_input_exit(&pdev->dev, guid->guid_string);
 

base-commit: 46cf053efec6a3a5f343fead837777efe8252a46

Signature · 1 line
2.24.1
#1 lore raw

Please ignore this patch I'll be sending another one. guid->guid_string is always true.

Quoted 38 lines · Ayman Bagabas

We're iterating over a NULL terminated array.

Fixes 1ac9abeb2e5b ("platform/x86: huawei-wmi: Move to platform driver")
---
 drivers/platform/x86/huawei-wmi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/huawei-wmi.c +3 -3
index a2d846c4a7ee..42d461eeeff4 100644
@@ -784,13 +784,13 @@ static const struct wmi_device_id huawei_wmi_events_id_table[] = {
 static int huawei_wmi_probe(struct platform_device *pdev)
 {
 	const struct wmi_device_id *guid = huawei_wmi_events_id_table;
+	struct input_dev *idev = *huawei_wmi->idev;
 	int err;
 
 	platform_set_drvdata(pdev, huawei_wmi);
 	huawei_wmi->dev = &pdev->dev;
 
-	while (*guid->guid_string) {
-		struct input_dev *idev = *huawei_wmi->idev;
+	while (guid->guid_string) {
 
 		if (wmi_has_guid(guid->guid_string)) {
 			err = huawei_wmi_input_setup(&pdev->dev, guid->guid_string, &idev);
@@ -820,7 +820,7 @@ static int huawei_wmi_remove(struct platform_device *pdev)
 {
 	const struct wmi_device_id *guid = huawei_wmi_events_id_table;
 
-	while (*guid->guid_string) {
+	while (guid->guid_string) {
 		if (wmi_has_guid(guid->guid_string))
 			huawei_wmi_input_exit(&pdev->dev, guid->guid_string);
 
Quoted 4 lines

base-commit: 46cf053efec6a3a5f343fead837777efe8252a46 --
2.24.1

--
Thank you,
Ayman

#2 lore raw
In reply to Ayman Bagabas
Quoted 1 line · Ayman Bagabas

We're iterating over a NULL terminated array.

This changelog is kind of messed up. This is how it looks in context:
https://marc.info/?l=linux-kernel&m=157731837511760&w=2
The subject and the commit message are far apart. What's wrong with iterating over a NULL terminated array? The changelog doesn't say which variable is NULL.

Quoted 12 lines
Fixes 1ac9abeb2e5b ("platform/x86: huawei-wmi: Move to platform driver")
---
 drivers/platform/x86/huawei-wmi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/huawei-wmi.c +0 -0
index a2d846c4a7ee..42d461eeeff4 100644

drivers/platform/x86/huawei-wmi.c static const struct wmi_device_id huawei_wmi_events_id_table[] = { · line 787

Quoted 4 lines
drivers/platform/x86/huawei-wmi.c +1 -0
@@ -784,13 +784,13 @@ static const struct wmi_device_id huawei_wmi_events_id_table[] = {
 static int huawei_wmi_probe(struct platform_device *pdev)
 {
 	const struct wmi_device_id *guid = huawei_wmi_events_id_table;
+	struct input_dev *idev = *huawei_wmi->idev;

This line seems like an unrelated change. I'm still not sure the justification for this. I really hate puzzling over patches to try figure out why a patch is making changes.

regards,
dan carpenter

#3 lore raw
Quoted 9 lines · Dan Carpenter
Quoted 1 line · Ayman Bagabas

We're iterating over a NULL terminated array.

This changelog is kind of messed up. This is how it looks in context:
https://marc.info/?l=linux-kernel&m=157731837511760&w=2
The subject and the commit message are far apart. What's wrong with iterating over a NULL terminated array? The changelog doesn't say which variable is NULL.

I'm really sorry for my poor subject and commit message that shouldn't happen again.

This is not an issue, the problem occurs to me when I try to use this module on kernel 5.0, particularly, when iterating over the struct wmi_device_id array. On kernel 5.0, I'm getting a NULL pointer dereference on *guid->guid_string on the 3rd NULL struct in the array. This is happening because the definition of struct wmi_device_id in <5.1 is

struct wmi_device_id {
	const char *guid_string;
};

Compared to this where guid->guid_string is not NULL

struct wmi_device_id {
	const char guid_string[UUID_STRING_LEN+1];
};
Quoted 7 lines
Quoted 7 lines
Fixes 1ac9abeb2e5b ("platform/x86: huawei-wmi: Move to platform driver")
---
 drivers/platform/x86/huawei-wmi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Quoted 13 lines

drivers/platform/x86/huawei-wmi.c static const struct wmi_device_id huawei_wmi_events_id_table[] = { · line 787

Quoted 9 lines
drivers/platform/x86/huawei-wmi.c +1 -0
index a2d846c4a7ee..42d461eeeff4 100644
@@ -784,13 +784,13 @@ static const struct wmi_device_id huawei_wmi_events_id_table[] = {
 static int huawei_wmi_probe(struct platform_device *pdev)
 {
 	const struct wmi_device_id *guid = huawei_wmi_events_id_table;
+	struct input_dev *idev = *huawei_wmi->idev;

This line seems like an unrelated change. I'm still not sure the justification for this. I really hate puzzling over patches to try figure out why a patch is making changes.

This one is a logical error, we have an array of input_dev pointers for each guid. Defining idev in the loop would always reset the pointer to the first element in the array. The address of each pointer then passed to huawei_wmi_input_setup to allocate an input device. We want to keep a pointer to each allocated input device in the static huawei_wmi struct.

Quoted 5 lines

regards,
dan carpenter

--
Thank you,
Ayman