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

loader: bd_open() should cleanup from disk_open() error

Browse Source 
Since bd_open() does early increment for reference counter and bcache
allocation, it also should undo those in case of the error.

Also remove unused variables rdev, g_err.
This commit is contained in:
Toomas Soome 2018-08-05 19:17:07 +00:00
parent d1e22b8f08
commit 8750586c61
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=337356
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stand/i386/libi386/biosdisk.c
View File

@ -337,11 +337,11 @@ bd_print(int verbose)
static int
bd_open(struct open_file *f, ...)
{
struct disk_devdesc *dev, rdev;
struct disk_devdesc *dev;
struct disk_devdesc disk;
int err, g_err;
va_list ap;
uint64_t size;
int rc;
va_start(ap, f);
dev = va_arg(ap, struct disk_devdesc *);
@ -365,6 +365,7 @@ bd_open(struct open_file *f, ...)
disk.d_slice = -1;
disk.d_partition = -1;
disk.d_offset = 0;
if (disk_open(&disk, BD(dev).bd_sectors * BD(dev).bd_sectorsize,
BD(dev).bd_sectorsize) == 0) {
@ -376,10 +377,17 @@ bd_open(struct open_file *f, ...)
disk_close(&disk);
}
err = disk_open(dev, BD(dev).bd_sectors * BD(dev).bd_sectorsize,
rc = disk_open(dev, BD(dev).bd_sectors * BD(dev).bd_sectorsize,
BD(dev).bd_sectorsize);
if (rc != 0) {
BD(dev).bd_open--;
if (BD(dev).bd_open == 0) {
bcache_free(BD(dev).bd_bcache);
BD(dev).bd_bcache = NULL;
}
}
return (err);
return (rc);
}
static int