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

In ifc_alloc_unit():

Browse Source 
- In the !wildcard case, return ENOSPC instead of confusing EEXIST
  in case if ifc->ifc_maxunit reached.
- Fix unit leak, that I've introduced in previous revision.

Submitted by:	Daan Vreeken <Daan vitsch.nl>
This commit is contained in:
Gleb Smirnoff 2012-08-30 12:18:45 +00:00
parent f2fbdacbf8
commit 3932d76033
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=239905
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/net/if_clone.c
View File

@ -443,21 +443,30 @@ ifc_alloc_unit(struct if_clone *ifc, int *unit)
wildcard = (*unit < 0);
retry:
if (wildcard) {
if (*unit > ifc->ifc_maxunit)
return (ENOSPC);
if (*unit < 0) {
*unit = alloc_unr(ifc->ifc_unrhdr);
if (*unit == -1)
return (ENOSPC);
} else {
*unit = alloc_unr_specific(ifc->ifc_unrhdr, *unit);
if (*unit == -1)
return (EEXIST);
if (*unit == -1) {
if (wildcard) {
(*unit)++;
goto retry;
} else
return (EEXIST);
}
}
snprintf(name, IFNAMSIZ, "%s%d", ifc->ifc_name, *unit);
if (ifunit(name) != NULL) {
if (wildcard)
goto retry; /* XXXGL: yep, it's a unit leak */
else
free_unr(ifc->ifc_unrhdr, *unit);
if (wildcard) {
(*unit)++;
goto retry;
} else
return (EEXIST);
}