Commit 61890dc2 authored by Konstantin Aladyshev's avatar Konstantin Aladyshev Committed by Greg Kroah-Hartman

usb: gadget: f_hid: fix report descriptor allocation

The commit 89ff3dfa ("usb: gadget: f_hid: fix f_hidg lifetime vs
cdev") has introduced a bug that leads to hid device corruption after
the replug operation.
Reverse device managed memory allocation for the report descriptor
to fix the issue.

Tested:
This change was tested on the AMD EthanolX CRB server with the BMC
based on the OpenBMC distribution. The BMC provides KVM functionality
via the USB gadget device:
- before: KVM page refresh results in a broken USB device,
- after: KVM page refresh works without any issues.

Fixes: 89ff3dfa ("usb: gadget: f_hid: fix f_hidg lifetime vs cdev")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKonstantin Aladyshev <aladyshev22@gmail.com>
Link: https://lore.kernel.org/r/20231206080744.253-2-aladyshev22@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 24be0b3c
...@@ -92,6 +92,7 @@ static void hidg_release(struct device *dev) ...@@ -92,6 +92,7 @@ static void hidg_release(struct device *dev)
{ {
struct f_hidg *hidg = container_of(dev, struct f_hidg, dev); struct f_hidg *hidg = container_of(dev, struct f_hidg, dev);
kfree(hidg->report_desc);
kfree(hidg->set_report_buf); kfree(hidg->set_report_buf);
kfree(hidg); kfree(hidg);
} }
...@@ -1287,7 +1288,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) ...@@ -1287,7 +1288,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi)
hidg->report_length = opts->report_length; hidg->report_length = opts->report_length;
hidg->report_desc_length = opts->report_desc_length; hidg->report_desc_length = opts->report_desc_length;
if (opts->report_desc) { if (opts->report_desc) {
hidg->report_desc = devm_kmemdup(&hidg->dev, opts->report_desc, hidg->report_desc = kmemdup(opts->report_desc,
opts->report_desc_length, opts->report_desc_length,
GFP_KERNEL); GFP_KERNEL);
if (!hidg->report_desc) { if (!hidg->report_desc) {
......
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