Răsfoiți Sursa

HID: fix hidinput_connect ignoring retval from input_register_device

hidinput_connect() ignores retval from input_register_device(). Fix it
by properly undoing all the registrations that have been already done,
and return error.

Signed-off-by: Dirk Hohndel <hohndel@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Dirk Hohndel 17 ani în urmă
părinte
comite
368d290ba2
1 a modificat fișierele cu 14 adăugiri și 4 ștergeri
  1. 14 4
      drivers/hid/hid-input.c

+ 14 - 4
drivers/hid/hid-input.c

@@ -1152,7 +1152,7 @@ int hidinput_connect(struct hid_device *hid)
 					kfree(hidinput);
 					kfree(hidinput);
 					input_free_device(input_dev);
 					input_free_device(input_dev);
 					err_hid("Out of memory during hid input probe");
 					err_hid("Out of memory during hid input probe");
-					return -1;
+					goto out_unwind;
 				}
 				}
 
 
 				input_set_drvdata(input_dev, hid);
 				input_set_drvdata(input_dev, hid);
@@ -1186,15 +1186,25 @@ int hidinput_connect(struct hid_device *hid)
 				 * UGCI) cram a lot of unrelated inputs into the
 				 * UGCI) cram a lot of unrelated inputs into the
 				 * same interface. */
 				 * same interface. */
 				hidinput->report = report;
 				hidinput->report = report;
-				input_register_device(hidinput->input);
+				if (input_register_device(hidinput->input))
+					goto out_cleanup;
 				hidinput = NULL;
 				hidinput = NULL;
 			}
 			}
 		}
 		}
 
 
-	if (hidinput)
-		input_register_device(hidinput->input);
+	if (hidinput && input_register_device(hidinput->input))
+		goto out_cleanup;
 
 
 	return 0;
 	return 0;
+
+out_cleanup:
+	input_free_device(hidinput->input);
+	kfree(hidinput);
+out_unwind:
+	/* unwind the ones we already registered */
+	hidinput_disconnect(hid);
+
+	return -1;
 }
 }
 EXPORT_SYMBOL_GPL(hidinput_connect);
 EXPORT_SYMBOL_GPL(hidinput_connect);