Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check route messages sizes more carefully

Browse Source 
cache pid
treat every message at a time, even if there are more messages to read
interpret also cloning routes

The latter two should fix the ldp_regen test
This commit is contained in:
kefren 2013-07-27 14:35:41 +00:00
parent c5c422fa26
commit 7eaad7a39f
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
usr.sbin/ldpd/mpls_routes.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mpls_routes.c,v 1.20 2013/07/24 09:05:53 kefren Exp $ */ /* $NetBSD: mpls_routes.c,v 1.21 2013/07/27 14:35:41 kefren Exp $ */
/*- /*-
* Copyright (c) 2010 The NetBSD Foundation, Inc. * Copyright (c) 2010 The NetBSD Foundation, Inc.
@ -62,6 +62,7 @@ int rt_seq = 200;
int dont_catch = 0; int dont_catch = 0;
extern int no_default_route; extern int no_default_route;
extern int debug_f, warn_f; extern int debug_f, warn_f;
static int my_pid = 0;
struct rt_msg replay_rt[REPLAY_MAX]; struct rt_msg replay_rt[REPLAY_MAX];
int replay_index = 0; int replay_index = 0;
@ -588,7 +589,8 @@ check_route(struct rt_msg * rg, uint rlen)
gate[0] = 0; gate[0] = 0;
pref[0] = 0; pref[0] = 0;
if (rlen < 3 || rg->m_rtm.rtm_version != RTM_VERSION) if (rlen <= offsetof(struct rt_msghdr, rtm_type) ||
rg->m_rtm.rtm_version != RTM_VERSION)
return LDP_E_ROUTE_ERROR; return LDP_E_ROUTE_ERROR;
if (rg->m_rtm.rtm_type == RTM_NEWADDR || if (rg->m_rtm.rtm_type == RTM_NEWADDR ||
@ -598,13 +600,23 @@ check_route(struct rt_msg * rg, uint rlen)
size_cp = sizeof(struct rt_msghdr); size_cp = sizeof(struct rt_msghdr);
CHECK_MINSA; CHECK_MINSA;
if (rg->m_rtm.rtm_pid == getpid() || if (my_pid == 0)
((rg->m_rtm.rtm_flags & RTF_DONE) == 0)) my_pid = getpid();
assert(my_pid != 0);
if (rg->m_rtm.rtm_pid == my_pid ||
(rg->m_rtm.rtm_pid != 0 && (rg->m_rtm.rtm_flags & RTF_DONE) == 0) ||
(rg->m_rtm.rtm_type != RTM_ADD &&
rg->m_rtm.rtm_type != RTM_DELETE &&
rg->m_rtm.rtm_type != RTM_CHANGE))
return LDP_E_OK; return LDP_E_OK;
debugp("Check route triggered by PID: %d\n", rg->m_rtm.rtm_pid); debugp("Check route triggered by PID: %d\n", rg->m_rtm.rtm_pid);
so_dest = (union sockunion *) rg->m_space; if (rg->m_rtm.rtm_addrs & RTA_DST)
so_dest = (union sockunion *) rg->m_space;
else
return LDP_E_ROUTE_ERROR;
if (so_dest->sa.sa_family != AF_INET) if (so_dest->sa.sa_family != AF_INET)
return LDP_E_OK;/* We don't care about non-IP changes */ return LDP_E_OK;/* We don't care about non-IP changes */
@ -613,8 +625,9 @@ check_route(struct rt_msg * rg, uint rlen)
if (rg->m_rtm.rtm_addrs & RTA_GATEWAY) { if (rg->m_rtm.rtm_addrs & RTA_GATEWAY) {
GETNEXT(so_gate, so_dest); GETNEXT(so_gate, so_dest);
if ((so_gate->sa.sa_family != AF_INET) && if ((rg->m_rtm.rtm_flags & RTF_CLONING) == 0 &&
(so_gate->sa.sa_family != AF_MPLS)) so_gate->sa.sa_family != AF_INET &&
so_gate->sa.sa_family != AF_MPLS)
return LDP_E_OK; return LDP_E_OK;
} }
if (rg->m_rtm.rtm_addrs & RTA_NETMASK) { if (rg->m_rtm.rtm_addrs & RTA_NETMASK) {
@ -636,6 +649,9 @@ check_route(struct rt_msg * rg, uint rlen)
so_pref->sa.sa_family = AF_INET; so_pref->sa.sa_family = AF_INET;
so_pref->sa.sa_len = sizeof(struct sockaddr_in); so_pref->sa.sa_len = sizeof(struct sockaddr_in);
if (rg->m_rtm.rtm_flags & RTF_CLONING)
so_gate = NULL;
switch (rg->m_rtm.rtm_type) { switch (rg->m_rtm.rtm_type) {
case RTM_CHANGE: case RTM_CHANGE:
lab = label_get(so_dest, so_pref); lab = label_get(so_dest, so_pref);

13
usr.sbin/ldpd/socketops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: socketops.c,v 1.30 2013/07/20 05:16:08 kefren Exp $ */ /* $NetBSD: socketops.c,v 1.31 2013/07/27 14:35:41 kefren Exp $ */
/* /*
* Copyright (c) 2010 The NetBSD Foundation, Inc. * Copyright (c) 2010 The NetBSD Foundation, Inc.
@ -903,10 +903,15 @@ the_big_loop(void)
new_peer_connection(); new_peer_connection();
else if (pfd[i].fd == route_socket) { else if (pfd[i].fd == route_socket) {
struct rt_msg xbuf; struct rt_msg xbuf;
int l; int l, rtmlen = sizeof(xbuf);
/* Read at least rtm_msglen */
l = recv(route_socket, &xbuf,
sizeof(u_short), MSG_PEEK);
if (l == sizeof(u_short))
rtmlen = xbuf.m_rtm.rtm_msglen;
do { do {
l = read(route_socket, &xbuf, l = recv(route_socket, &xbuf,
sizeof(xbuf)); rtmlen, MSG_WAITALL);
} while ((l == -1) && (errno == EINTR)); } while ((l == -1) && (errno == EINTR));
if (l == -1) if (l == -1)