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

o Make sure to clear f->f_devdata if d_dev->dv_open() fails. It

Browse Source 
would otherwise cause devclose() to free() the memory again.
o  Refactor devopen() so that it's more readable.
This commit is contained in:
Marcel Moolenaar 2006-11-02 00:02:22 +00:00
parent 65deb9d947
commit ac2bbfc8cf
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/boot/common/devopen.c
View File

@ -35,20 +35,25 @@ __FBSDID("$FreeBSD$");
int
devopen(struct open_file *f, const char *fname, const char **file)
{
struct devdesc *dev;
int result;
struct devdesc *dev;
int result;
if ((result = archsw.arch_getdev((void *)&dev, fname, file)) == 0) { /* get the device */
/* point to device-specific data so that device open can use it */
f->f_devdata = dev;
if ((result = dev->d_dev->dv_open(f, dev)) == 0) { /* try to open it */
/* reference the devsw entry from the open_file structure */
f->f_dev = dev->d_dev;
} else {
free(dev); /* release the device descriptor */
}
result = archsw.arch_getdev((void **)&dev, fname, file);
if (result)
return (result);
/* point to device-specific data so that device open can use it */
f->f_devdata = dev;
result = dev->d_dev->dv_open(f, dev);
if (result != 0) {
f->f_devdata = NULL;
free(dev);
return (result);
}
return(result);
/* reference the devsw entry from the open_file structure */
f->f_dev = dev->d_dev;
return (0);
}
int