d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a note about a bug in how sio manages its softc. This was

Browse Source 
discovered by Dorr H. Clark.  I'm not at all sure how to fix it, but
wanted to document it at the very least...
This commit is contained in:
Warner Losh 2008-10-08 08:08:03 +00:00
parent 7fd08dc0f9
commit e21f22596b
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/sio/sio.c
View File

@ -696,6 +696,14 @@ sioprobe(dev, xrid, rclk, noprobe)
bus_release_resource(dev, SYS_RES_IOPORT, rid, port);
if (iobase == siocniobase)
result = 0;
/*
* XXX: Since we don't return 0, we shouldn't be relying on
* the softc that we set to persist to the call to attach
* since other probe routines may be called, and the malloc
* here causes subr_bus to not allocate anything for the
* other probes. Instead, this softc is preserved and other
* probe routines can corrupt it.
*/
if (result != 0) {
device_set_softc(dev, NULL);
free(com, M_DEVBUF);
@ -773,6 +781,13 @@ sioprobe(dev, xrid, rclk, noprobe)
bus_release_resource(dev, SYS_RES_IOPORT, rid, port);
if (iobase == siocniobase)
result = 0;
/*
* XXX: Since we don't return 0, we shouldn't be relying on the softc
* that we set to persist to the call to attach since other probe
* routines may be called, and the malloc here causes subr_bus to not
* allocate anything for the other probes. Instead, this softc is
* preserved and other probe routines can corrupt it.
*/
if (result != 0) {
device_set_softc(dev, NULL);
free(com, M_DEVBUF);