svn commit: r360104 - head/sys/dev/evdev

Xin LI delphij at FreeBSD.org
Sun Apr 19 17:28:43 UTC 2020


Author: delphij
Date: Sun Apr 19 17:28:42 2020
New Revision: 360104
URL: https://svnweb.freebsd.org/changeset/base/360104

Log:
  Use LIST_FOREACH_SAFE instead of LIST_FOREACH as we are removing
  elements in the middle.
  
  This fixes a panic when detaching USB mouse.
  
  PR:		245732
  Reviewed by:	wulf
  MFC after:	3 days
  Differential Revision:	https://reviews.freebsd.org/D24500

Modified:
  head/sys/dev/evdev/evdev.c

Modified: head/sys/dev/evdev/evdev.c
==============================================================================
--- head/sys/dev/evdev/evdev.c	Sun Apr 19 17:19:29 2020	(r360103)
+++ head/sys/dev/evdev/evdev.c	Sun Apr 19 17:28:42 2020	(r360104)
@@ -358,7 +358,7 @@ evdev_register_mtx(struct evdev_dev *evdev, struct mtx
 int
 evdev_unregister(struct evdev_dev *evdev)
 {
-	struct evdev_client *client;
+	struct evdev_client *client, *tmp;
 	int ret;
 	debugf(evdev, "%s: unregistered evdev provider: %s\n",
 	    evdev->ev_shortname, evdev->ev_name);
@@ -368,7 +368,7 @@ evdev_unregister(struct evdev_dev *evdev)
 	EVDEV_LOCK(evdev);
 	evdev->ev_cdev->si_drv1 = NULL;
 	/* Wake up sleepers */
-	LIST_FOREACH(client, &evdev->ev_clients, ec_link) {
+	LIST_FOREACH_SAFE(client, &evdev->ev_clients, ec_link, tmp) {
 		evdev_revoke_client(client);
 		evdev_dispose_client(evdev, client);
 		EVDEV_CLIENT_LOCKQ(client);


More information about the svn-src-head mailing list