mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-05 08:00:30 +00:00
kern: ether_gen_addr: randomize on default hostuuid, too
Currently, this will still hash the default (all zero) hostuuid and potentially arrive at a MAC address that has a high chance of collision if another interface of the same name appears in the same broadcast domain on another host without a hostuuid, e.g., some virtual machine setups. Instead of using the default hostuuid, just treat it as a failure and generate a random LA unicast MAC address. Reviewed by: bz, gbe, imp, kbowling, kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D29788
This commit is contained in:
parent
e58a65ccda
commit
2d741f33bd
|
@ -61,8 +61,9 @@ or on machines that do not use
|
||||||
.Xr loader 8 .
|
.Xr loader 8 .
|
||||||
.Pp
|
.Pp
|
||||||
.Nm
|
.Nm
|
||||||
can fail to derive a MAC address due to memory allocation failure.
|
can fail to derive a MAC address due to memory allocation failure, or because
|
||||||
In this case, a locally-administered unicast MAC address will be randomly
|
the hostid has not been populated.
|
||||||
|
In these cases, a locally-administered unicast MAC address will be randomly
|
||||||
generated and returned via the
|
generated and returned via the
|
||||||
.Ar hwaddr
|
.Ar hwaddr
|
||||||
parameter.
|
parameter.
|
||||||
|
|
|
@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include <security/mac/mac_framework.h>
|
#include <security/mac/mac_framework.h>
|
||||||
|
|
||||||
#define DEFAULT_HOSTUUID "00000000-0000-0000-0000-000000000000"
|
|
||||||
#define PRISON0_HOSTUUID_MODULE "hostuuid"
|
#define PRISON0_HOSTUUID_MODULE "hostuuid"
|
||||||
|
|
||||||
MALLOC_DEFINE(M_PRISON, "prison", "Prison structures");
|
MALLOC_DEFINE(M_PRISON, "prison", "Prison structures");
|
||||||
|
|
|
@ -1443,6 +1443,11 @@ ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr)
|
||||||
char jailname[MAXHOSTNAMELEN];
|
char jailname[MAXHOSTNAMELEN];
|
||||||
|
|
||||||
getcredhostuuid(curthread->td_ucred, uuid, sizeof(uuid));
|
getcredhostuuid(curthread->td_ucred, uuid, sizeof(uuid));
|
||||||
|
if (strncmp(uuid, DEFAULT_HOSTUUID, sizeof(uuid)) == 0) {
|
||||||
|
/* Fall back to a random mac address. */
|
||||||
|
goto rando;
|
||||||
|
}
|
||||||
|
|
||||||
/* If each (vnet) jail would also have a unique hostuuid this would not
|
/* If each (vnet) jail would also have a unique hostuuid this would not
|
||||||
* be necessary. */
|
* be necessary. */
|
||||||
getjailname(curthread->td_ucred, jailname, sizeof(jailname));
|
getjailname(curthread->td_ucred, jailname, sizeof(jailname));
|
||||||
|
@ -1450,9 +1455,7 @@ ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr)
|
||||||
jailname);
|
jailname);
|
||||||
if (sz < 0) {
|
if (sz < 0) {
|
||||||
/* Fall back to a random mac address. */
|
/* Fall back to a random mac address. */
|
||||||
arc4rand(hwaddr, sizeof(*hwaddr), 0);
|
goto rando;
|
||||||
hwaddr->octet[0] = 0x02;
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SHA1Init(&ctx);
|
SHA1Init(&ctx);
|
||||||
|
@ -1467,6 +1470,14 @@ ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr)
|
||||||
hwaddr->octet[i] = addr >> ((ETHER_ADDR_LEN - i - 1) * 8) &
|
hwaddr->octet[i] = addr >> ((ETHER_ADDR_LEN - i - 1) * 8) &
|
||||||
0xFF;
|
0xFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
rando:
|
||||||
|
arc4rand(hwaddr, sizeof(*hwaddr), 0);
|
||||||
|
/* Unicast */
|
||||||
|
hwaddr->octet[0] &= 0xFE;
|
||||||
|
/* Locally administered. */
|
||||||
|
hwaddr->octet[0] |= 0x02;
|
||||||
}
|
}
|
||||||
|
|
||||||
DECLARE_MODULE(ether, ether_mod, SI_SUB_INIT_IF, SI_ORDER_ANY);
|
DECLARE_MODULE(ether, ether_mod, SI_SUB_INIT_IF, SI_ORDER_ANY);
|
||||||
|
|
|
@ -140,6 +140,7 @@ MALLOC_DECLARE(M_PRISON);
|
||||||
#include <sys/osd.h>
|
#include <sys/osd.h>
|
||||||
|
|
||||||
#define HOSTUUIDLEN 64
|
#define HOSTUUIDLEN 64
|
||||||
|
#define DEFAULT_HOSTUUID "00000000-0000-0000-0000-000000000000"
|
||||||
#define OSRELEASELEN 32
|
#define OSRELEASELEN 32
|
||||||
|
|
||||||
struct racct;
|
struct racct;
|
||||||
|
|
Loading…
Reference in a new issue