In ifc_alloc_unit():

- 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>

1 files changed, 15 insertions, 6 deletions

diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
index 5720fc4feaec..3543e2f71fca 100644
--- a/sys/net/if_clone.c
+++ b/sys/net/if_clone.c
@@ -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);
 	}