Commit 9b8e2220 authored by Charles Han's avatar Charles Han Committed by Jiri Kosina
Browse files

HID: multitouch: Add NULL check in mt_input_configured



devm_kasprintf() can return a NULL pointer on failure,but this
returned value in mt_input_configured() is not checked.
Add NULL check in mt_input_configured(), to handle kernel NULL
pointer dereference error.

Fixes: 47943946 ("HID: multitouch: Correct devm device reference for hidinput input_dev name")
Signed-off-by: default avatarCharles Han <hanchunchao@inspur.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 45ab5166
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -1679,9 +1679,12 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
		break;
	}

	if (suffix)
	if (suffix) {
		hi->input->name = devm_kasprintf(&hdev->dev, GFP_KERNEL,
						 "%s %s", hdev->name, suffix);
		if (!hi->input->name)
			return -ENOMEM;
	}

	return 0;
}