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

Remove useless zeroing of RTAX_DST on error.

Browse Source 
Cleanup a bit.

MFC after:	1 month
This commit is contained in:
Alexander V. Chernikov 2014-04-27 10:43:48 +00:00
parent 92c227af54
commit f1fcb55271
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=265011
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/net/rtsock.c
View File

@ -542,32 +542,38 @@ route_output(struct mbuf *m, struct socket *so)
panic("route_output");
len = m->m_pkthdr.len;
if (len < sizeof(*rtm) ||
len != mtod(m, struct rt_msghdr *)->rtm_msglen) {
info.rti_info[RTAX_DST] = NULL;
len != mtod(m, struct rt_msghdr *)->rtm_msglen)
senderr(EINVAL);
}
R_Malloc(rtm, struct rt_msghdr *, len);
if (rtm == NULL) {
info.rti_info[RTAX_DST] = NULL;
if (rtm == NULL)
senderr(ENOBUFS);
}
m_copydata(m, 0, len, (caddr_t)rtm);
bzero(&info, sizeof(info));
if (rtm->rtm_version != RTM_VERSION) {
info.rti_info[RTAX_DST] = NULL;
/* Do not touch message since format is unknown */
Free(rtm);
rtm = NULL;
senderr(EPROTONOSUPPORT);
}
/*
* Starting from here, it is possible
* to alter original message and insert
* caller PID and error value.
*/
rtm->rtm_pid = curproc->p_pid;
bzero(&info, sizeof(info));
info.rti_addrs = rtm->rtm_addrs;
/*
* rt_xaddrs() performs s6_addr[2] := sin6_scope_id for AF_INET6
* link-local address because rtrequest requires addresses with
* embedded scope id.
*/
if (rt_xaddrs((caddr_t)(rtm + 1), len + (caddr_t)rtm, &info)) {
info.rti_info[RTAX_DST] = NULL;
if (rt_xaddrs((caddr_t)(rtm + 1), len + (caddr_t)rtm, &info))
senderr(EINVAL);
}
info.rti_flags = rtm->rtm_flags;
if (info.rti_info[RTAX_DST] == NULL ||
info.rti_info[RTAX_DST]->sa_family >= AF_MAX ||