Try to fix a bug introduced in r228623. We started to copy the ifa_msghdr
as otherwise platforms with strict alignment would break. It's unclear to me if there's also a problem with access to the address list following the structure. However we never copied the address list after the structure and thus are pointing at random memory. For now just use a pointer to the original memory for accessing the address list making it at least work on platforms with weak memory access. PR: 195445 Reported by: wolfgang lyxys.ka.sub.org Tested by: wolfgang lyxys.ka.sub.org (x86) MFC after: 3 days
This commit is contained in:
parent
24fbfc5fd5
commit
ce42ce038e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=295202
@ -982,7 +982,7 @@ handle_rtmsg(struct rt_msghdr *rtm)
|
|||||||
{
|
{
|
||||||
struct sockaddr *addrs[RTAX_MAX];
|
struct sockaddr *addrs[RTAX_MAX];
|
||||||
struct if_msghdr *ifm;
|
struct if_msghdr *ifm;
|
||||||
struct ifa_msghdr ifam;
|
struct ifa_msghdr ifam, *ifamp;
|
||||||
struct ifma_msghdr *ifmam;
|
struct ifma_msghdr *ifmam;
|
||||||
#ifdef RTM_IFANNOUNCE
|
#ifdef RTM_IFANNOUNCE
|
||||||
struct if_announcemsghdr *ifan;
|
struct if_announcemsghdr *ifan;
|
||||||
@ -1002,8 +1002,9 @@ handle_rtmsg(struct rt_msghdr *rtm)
|
|||||||
switch (rtm->rtm_type) {
|
switch (rtm->rtm_type) {
|
||||||
|
|
||||||
case RTM_NEWADDR:
|
case RTM_NEWADDR:
|
||||||
memcpy(&ifam, rtm, sizeof(ifam));
|
ifamp = (struct ifa_msghdr *)rtm;
|
||||||
mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs);
|
memcpy(&ifam, ifamp, sizeof(ifam));
|
||||||
|
mib_extract_addrs(ifam.ifam_addrs, (u_char *)(ifamp + 1), addrs);
|
||||||
if (addrs[RTAX_IFA] == NULL || addrs[RTAX_NETMASK] == NULL)
|
if (addrs[RTAX_IFA] == NULL || addrs[RTAX_NETMASK] == NULL)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -1029,8 +1030,9 @@ handle_rtmsg(struct rt_msghdr *rtm)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case RTM_DELADDR:
|
case RTM_DELADDR:
|
||||||
memcpy(&ifam, rtm, sizeof(ifam));
|
ifamp = (struct ifa_msghdr *)rtm;
|
||||||
mib_extract_addrs(ifam.ifam_addrs, (u_char *)(&ifam + 1), addrs);
|
memcpy(&ifam, ifamp, sizeof(ifam));
|
||||||
|
mib_extract_addrs(ifam.ifam_addrs, (u_char *)(ifamp + 1), addrs);
|
||||||
if (addrs[RTAX_IFA] == NULL)
|
if (addrs[RTAX_IFA] == NULL)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user