diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-10-29 10:50:33 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-10-29 10:51:07 +0100 |
| commit | 0a2478a918763f73de5d1b78ebb1023c31042583 (patch) | |
| tree | 019dd2f04e84688351de62deffa3ec99a6015a4e /src | |
| parent | 9243e967a370a9e69b0a81843288a9db3e2dfc62 (diff) | |
sd-rtnl: fix reading of nla type
We must filter out the 'network-byteorder' and 'nested' flags.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsystemd/sd-rtnl/rtnl-message.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c index b501a52cf1..dac3061271 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -36,6 +36,8 @@ #define GET_CONTAINER(m, i) ((i) < (m)->n_containers ? (struct rtattr*)((uint8_t*)(m)->hdr + (m)->container_offsets[i]) : NULL) #define PUSH_CONTAINER(m, new) (m)->container_offsets[(m)->n_containers ++] = (uint8_t*)(new) - (uint8_t*)(m)->hdr; +#define RTA_TYPE(rta) ((rta)->rta_type & NLA_TYPE_MASK) + static int message_new_empty(sd_rtnl *rtnl, sd_rtnl_message **ret) { sd_rtnl_message *m; @@ -1066,7 +1068,7 @@ int rtnl_message_parse(sd_rtnl_message *m, *rta_tb_size = max + 1; for (; RTA_OK(rta, rt_len); rta = RTA_NEXT(rta, rt_len)) { - type = rta->rta_type; + type = RTA_TYPE(rta); /* if the kernel is newer than the headers we used when building, we ignore out-of-range attributes |