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

Fix direct route installation with net/bird.

Browse Source 
Slighly relax the gateway validation rules imposed by the
 2fe5a79425c7, by requiring only first 8 bytes (everyhing
 before sdl_data to be present in the AF_LINK gateway.

Reported by:	olivier
This commit is contained in:
Alexander V. Chernikov 2021-04-10 16:25:24 +01:00
parent 4d9128da54
commit 7f5f3fcc32
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/net/rtsock.c
View File

@ -1381,20 +1381,21 @@ cleanup_xaddrs_gateway(struct rt_addrinfo *info)
#endif
case AF_LINK:
{
struct sockaddr_dl_short *gw_sdl;
struct sockaddr_dl *gw_sdl;
gw_sdl = (struct sockaddr_dl_short *)gw;
if (gw_sdl->sdl_len < sizeof(struct sockaddr_dl_short)) {
size_t sdl_min_len = offsetof(struct sockaddr_dl, sdl_data);
gw_sdl = (struct sockaddr_dl *)gw;
if (gw_sdl->sdl_len < sdl_min_len) {
printf("gw sdl_len too small\n");
return (EINVAL);
}
const struct sockaddr_dl_short sdl = {
.sdl_family = AF_LINK,
.sdl_len = sizeof(struct sockaddr_dl_short),
.sdl_len = sdl_min_len,
.sdl_index = gw_sdl->sdl_index,
};
*gw_sdl = sdl;
memcpy(gw_sdl, &sdl, sdl_min_len);
break;
}
}