Index: head/sys/cam/ctl/ctl_frontend_ioctl.c
===================================================================
--- head/sys/cam/ctl/ctl_frontend_ioctl.c
+++ head/sys/cam/ctl/ctl_frontend_ioctl.c
@@ -226,7 +226,7 @@
 		req->status = CTL_LUN_ERROR;
 		snprintf(req->error_str, sizeof(req->error_str),
 		    "ctl_port_register() failed with error %d", retval);
-		free(port, M_CTL);
+		free(cfi, M_CTL);
 		return;
 	}
 
@@ -247,7 +247,9 @@
 		req->status = CTL_LUN_ERROR;
 		snprintf(req->error_str, sizeof(req->error_str),
 		    "make_dev_s() failed with error %d", retval);
-		free(port, M_CTL);
+		ctl_port_offline(port);
+		ctl_port_deregister(port);
+		free(cfi, M_CTL);
 		return;
 	}