pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Parse IFA_F_* values above 0x80. 

In RTM_NEWADDR messages, the first 8 flags are reported in the
ifa_flags field in struct ifaddrmsg, but flags above 0x80 are
reported in the IFA_FLAGS attribute. NetlinkEvent currently only
looks at ifa_flags, so it cannot see higher-value flags such as
IFA_F_STABLE_PRIVACY. Fix this by parsing the IFA_FLAGS
attribute.

Bug: 155005831
Test: makes new test in aosp/1295495 pass
Change-Id: I723f1106cbcea2186fc6452305942a0f8301fd2a
This commit is contained in:
Lorenzo Colitti 2020-04-26 19:21:12 +09:00
parent c3d30bfdff
commit 096fc5351f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libsysutils/src/NetlinkEvent.cpp
View File

@ -180,6 +180,7 @@ bool NetlinkEvent::parseIfAddrMessage(const struct nlmsghdr *nh) {
struct ifa_cacheinfo *cacheinfo = nullptr;
char addrstr[INET6_ADDRSTRLEN] = "";
char ifname[IFNAMSIZ] = "";
uint32_t flags = 0;
if (!checkRtNetlinkLength(nh, sizeof(*ifaddr)))
return false;
@ -230,6 +231,10 @@ bool NetlinkEvent::parseIfAddrMessage(const struct nlmsghdr *nh) {
SLOGD("Unknown ifindex %d in %s", ifaddr->ifa_index, msgtype);
}
// First 8 bits of flags. In practice will always be overridden by the IFA_FLAGS below,
// because that always appears after IFA_ADDRESS. But just in case, support both orders.
flags = (flags & 0xffffff00) | ifaddr->ifa_flags;
} else if (rta->rta_type == IFA_CACHEINFO) {
// Address lifetime information.
if (maybeLogDuplicateAttribute(cacheinfo, "IFA_CACHEINFO", msgtype))
@ -242,6 +247,10 @@ bool NetlinkEvent::parseIfAddrMessage(const struct nlmsghdr *nh) {
}
cacheinfo = (struct ifa_cacheinfo *) RTA_DATA(rta);
} else if (rta->rta_type == IFA_FLAGS) {
// In practice IFA_FLAGS is always after IFA_ADDRESS, so this will overwrite the flags.
flags = *(uint32_t*)RTA_DATA(rta);
}
}
@ -256,7 +265,7 @@ bool NetlinkEvent::parseIfAddrMessage(const struct nlmsghdr *nh) {
mSubsystem = strdup("net");
asprintf(&mParams[0], "ADDRESS=%s/%d", addrstr, ifaddr->ifa_prefixlen);
asprintf(&mParams[1], "INTERFACE=%s", ifname);
asprintf(&mParams[2], "FLAGS=%u", ifaddr->ifa_flags);
asprintf(&mParams[2], "FLAGS=%u", flags);
asprintf(&mParams[3], "SCOPE=%u", ifaddr->ifa_scope);
asprintf(&mParams[4], "IFINDEX=%u", ifaddr->ifa_index);