diff options
| author | Laurent Vivier | 2020-11-16 17:36:22 +0100 |
|---|---|---|
| committer | Laurent Vivier | 2020-11-17 15:22:49 +0100 |
| commit | f536612dc1b5923efd794815baecf3808d07dfae (patch) | |
| tree | 9d3d0063c5553699d9b384499c941c3b01a523ed /linux-user/fd-trans.c | |
| parent | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-11-1... (diff) | |
| download | qemu-f536612dc1b5923efd794815baecf3808d07dfae.tar.gz qemu-f536612dc1b5923efd794815baecf3808d07dfae.tar.xz qemu-f536612dc1b5923efd794815baecf3808d07dfae.zip | |
linux-user,netlink: fix message translation with ip command
With iproute2-5.8.0, the route, link and addr show commands fail:
root@sid:~# ip addr show
RTNETLINK answers: Unknown error 352321537
Dump terminated
root@sid:~# ip link show
RTNETLINK answers: Unknown error 352321537
Dump terminated
root@sid:~# ip route show
RTNETLINK answers: Unknown error 352321537
Dump terminated
This patch correctly decodes the GETROUTE and GETLINK commands and adds
the RTA_TABLE message.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20201116163622.791442-1-laurent@vivier.eu>
Diffstat (limited to 'linux-user/fd-trans.c')
| -rw-r--r-- | linux-user/fd-trans.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c index 1486c81aaa..7551c88330 100644 --- a/linux-user/fd-trans.c +++ b/linux-user/fd-trans.c @@ -1160,6 +1160,7 @@ static abi_long target_to_host_data_route_rtattr(struct rtattr *rtattr) break; /* u32 */ case QEMU_RTA_PRIORITY: + case QEMU_RTA_TABLE: case QEMU_RTA_OIF: u32 = RTA_DATA(rtattr); *u32 = tswap32(*u32); @@ -1200,11 +1201,10 @@ static abi_long target_to_host_data_route(struct nlmsghdr *nlh) struct rtmsg *rtm; switch (nlh->nlmsg_type) { - case RTM_GETLINK: - break; case RTM_NEWLINK: case RTM_DELLINK: case RTM_SETLINK: + case RTM_GETLINK: if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifi))) { ifi = NLMSG_DATA(nlh); ifi->ifi_type = tswap16(ifi->ifi_type); @@ -1225,10 +1225,9 @@ static abi_long target_to_host_data_route(struct nlmsghdr *nlh) NLMSG_LENGTH(sizeof(*ifa))); } break; - case RTM_GETROUTE: - break; case RTM_NEWROUTE: case RTM_DELROUTE: + case RTM_GETROUTE: if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*rtm))) { rtm = NLMSG_DATA(nlh); rtm->rtm_flags = tswap32(rtm->rtm_flags); |