[PATCH] usb: gadget/composite : Avoid crash with bad gadget drivers

* [PATCH] usb: gadget/composite : Avoid crash with bad gadget drivers
@ 2013-08-09 18:23 Philippe De Swert
  2013-08-12 18:08 ` Felipe Balbi
  0 siblings, 1 reply; 4+ messages in thread
From: Philippe De Swert @ 2013-08-09 18:23 UTC (permalink / raw)
  To: linux-usb, gregkh, balbi, linux-kernel; +Cc: Philippe De Swert

Some bad gadget drivers do not check the return status of usb_add_config.
Thus they get a not correctly initialized config and when this gadget gets
deactivated the whole kernel crashes. Since on initialization failure cdev
is set to NULL it can be used to detect this problem situation. It can be
argued that the faulty gadget driver should be fixed, but imho it is better
to avoid crashing the kernel and letting the gadget developer know he/she
is making a mistake. And have the developer of said gadget driver then fix
the problem of course.

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
---
 drivers/usb/gadget/composite.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 55f4df6..e019bb5 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -848,12 +848,18 @@ void usb_remove_config(struct usb_composite_dev *cdev,
 {
 	unsigned long flags;
 
+	if (config->cdev == NULL) {
+		pr_warn("Calling usb_remove_config without a matching usb_add_config!\n");
+		goto end;
+	}
+
 	spin_lock_irqsave(&cdev->lock, flags);
 
 	if (cdev->config == config)
 		reset_config(cdev);
 
 	spin_unlock_irqrestore(&cdev->lock, flags);
+end:
 
 	remove_config(cdev, config);
 }
-- 
1.8.1.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread