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

Fix handling of tap/vmnet flag in relation to cloning and properly enforce

Browse Source 
largest supported unit number for this device driver.

Reported by:	Kaho Toshikazu <kaho@easy.es.tuat.ac.jp>
This commit is contained in:
Poul-Henning Kamp 2004-03-10 08:02:29 +00:00
parent a24cc63af9
commit 4f81134a23
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=126796
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/net/if_tap.c
View File

@ -218,7 +218,7 @@ tapclone(arg, name, namelen, dev)
/* find any existing device, or allocate new unit number */
i = clone_create(&tapclones, &tap_cdevsw, &unit, dev, extra);
if (i) {
*dev = make_dev(&tap_cdevsw, unit2minor(unit) | extra,
*dev = make_dev(&tap_cdevsw, unit2minor(unit | extra),
UID_ROOT, GID_WHEEL, 0600, "%s%d", device_name, unit);
if (*dev != NULL)
(*dev)->si_flags |= SI_CHEAPCLONE;
@ -247,20 +247,18 @@ tapcreate(dev)
MALLOC(tp, struct tap_softc *, sizeof(*tp), M_TAP, M_WAITOK | M_ZERO);
SLIST_INSERT_HEAD(&taphead, tp, tap_next);
unit = dev2unit(dev) & TAPMAXUNIT;
unit = dev2unit(dev);
/* select device: tap or vmnet */
if (minor(dev) & VMNET_DEV_MASK) {
if (unit & VMNET_DEV_MASK) {
name = VMNET;
tp->tap_flags |= TAP_VMNET;
} else
name = TAP;
TAPDEBUG("tapcreate(%s%d). minor = %#x\n", name, unit, minor(dev));
unit &= TAPMAXUNIT;
if (!(dev->si_flags & SI_NAMED))
dev = make_dev(&tap_cdevsw, minor(dev), UID_ROOT, GID_WHEEL,
0600, "%s%d", name, unit);
TAPDEBUG("tapcreate(%s%d). minor = %#x\n", name, unit, minor(dev));
/* generate fake MAC address: 00 bd xx xx xx unit_no */
macaddr_hi = htons(0x00bd);
@ -306,13 +304,13 @@ tapopen(dev, flag, mode, td)
struct thread *td;
{
struct tap_softc *tp = NULL;
int unit, error;
int error;
if ((error = suser(td)) != 0)
return (error);
unit = dev2unit(dev) & TAPMAXUNIT;
if ((dev2unit(dev) & CLONE_UNITMASK) > TAPMAXUNIT)
return (ENXIO);
tp = dev->si_drv1;
if (tp == NULL) {