USB: usb_serial_resume bug fix

Sarah Sharp · gregkh · commit 8abaee238ebb · 2007-10-25T12:18:45.000-07:00
Avoid potential null pointer dereference.

Signed-off-by: Sarah Sharp &lt;sarah.a.sharp@intel.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@suse.de&gt;
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
@@ -1123,7 +1123,9 @@ int usb_serial_resume(struct usb_interface *intf)
 {
 	struct usb_serial *serial = usb_get_intfdata(intf);
 
-	return serial->type->resume(serial);
+	if (serial->type->resume)
+		return serial->type->resume(serial);
+	return 0;
 }
 EXPORT_SYMBOL(usb_serial_resume);
 

Original file line number	Diff line number	Diff line change
`@@ -1123,7 +1123,9 @@ int usb_serial_resume(struct usb_interface *intf)`
`1123`	`1123`	`{`
`1124`	`1124`	`struct usb_serial *serial = usb_get_intfdata(intf);`
`1125`	`1125`
`1126`		`- return serial->type->resume(serial);`
	`1126`	`+ if (serial->type->resume)`
	`1127`	`+ return serial->type->resume(serial);`
	`1128`	`+ return 0;`
`1127`	`1129`	`}`
`1128`	`1130`	`EXPORT_SYMBOL(usb_serial_resume);`
`1129`	`1131`