From 0578923685a8a0bdaf225d9b065c9fff4c077e01 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jun 2022 09:26:04 +0000 Subject: [PATCH] HID: add USB_HID dependancy to hid-prodikeys stable inclusion from linux-4.19.221 commit cb54ea86f247a28ce5d8ec147e58c13de669d04a category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5BTIG CVE: CVE-2022-20132 -------------------------------- commit 30cb3c2ad24b66fb7639a6d1f4390c74d6e68f94 upstream. The prodikeys HID driver only controls USB devices, yet did not have a dependancy on USB_HID. This causes build errors on some configurations like nios2 when building due to new changes to the prodikeys driver. Reported-by: kernel test robot Cc: stable@vger.kernel.org Cc: Jiri Kosina Cc: Benjamin Tissoires Signed-off-by: Greg Kroah-Hartman Signed-off-by: Benjamin Tissoires Link: https://lore.kernel.org/r/20211203081231.2856936-1-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Rui Xiang Reviewed-by: Zhang Xiaoxu Reviewed-by: Xiu Jianfeng Signed-off-by: Yongqiang Liu --- drivers/hid/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 61e1953ff921..8f69991bdb30 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -219,7 +219,7 @@ config HID_COUGAR config HID_PRODIKEYS tristate "Prodikeys PC-MIDI Keyboard support" - depends on HID && SND + depends on USB_HID && SND select SND_RAWMIDI ---help--- Support for Prodikeys PC-MIDI Keyboard device support. -- GitLab