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

routing: fix crash when RTM_CHANGE results in no-op for the multipath

Browse Source 
route.

Reporting logic assumed there is always some nhop change for every
 successful modification operation. Explicitly check that the changed
 nexthop indeed exists when reporting back to userland.

MFC after:	2 weeks
Reported by:	Claudio Jeker <claudio.jeker@klarasystems.com>
Tested by:	Claudio Jeker <claudio.jeker@klarasystems.com>
This commit is contained in:
Alexander V. Chernikov 2022-06-25 19:32:59 +00:00
parent bd03f10a60
commit c260d5cd8e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/net/rtsock.c
View File

@ -1124,9 +1124,12 @@ route_output(struct mbuf *m, struct socket *so, ...)
rc = rc_simple;
}
#endif
/* nh MAY be empty if RTM_CHANGE request is no-op */
nh = rc.rc_nh_new;
rtm->rtm_index = nh->nh_ifp->if_index;
rtm->rtm_flags = rc.rc_rt->rte_flags | nhop_get_rtflags(nh);
if (nh != NULL) {
rtm->rtm_index = nh->nh_ifp->if_index;
rtm->rtm_flags = rc.rc_rt->rte_flags | nhop_get_rtflags(nh);
}
}
break;
@ -1163,7 +1166,7 @@ route_output(struct mbuf *m, struct socket *so, ...)
senderr(EOPNOTSUPP);
}
if (error == 0) {
if (error == 0 && nh != NULL) {
error = update_rtm_from_rc(&info, &rtm, alloc_len, &rc, nh);
/*
* Note that some sockaddr pointers may have changed to