diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-07 18:18:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-07 18:18:24 +0000 |
| commit | ff372bb5c469e14d6d64f788710b7c3e37c12e01 (patch) | |
| tree | 24c10acac22476be7189a27b865b9d6c71c2463d /linux-user/fd-trans.c | |
| parent | d55451dcdee0704f6a756d4ec95be31515751235 (diff) | |
| parent | 0f5faca78267beb16d8a096e9729f39d552e5c14 (diff) | |
| download | focaccia-qemu-ff372bb5c469e14d6d64f788710b7c3e37c12e01.tar.gz focaccia-qemu-ff372bb5c469e14d6d64f788710b7c3e37c12e01.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.0-pull-request' into staging
- add new netlink type from linux v4.18 and v4.19 - fix coverity warning (CID 1390634) - fix ioctl(SIOCGIFCONF) crash # gpg: Signature made Thu 07 Feb 2019 13:12:53 GMT # gpg: using RSA key F30C38BD3F2FBE3C # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/linux-user-for-4.0-pull-request: linux-user: add new netlink types linux-user: Check sscanf return value in open_net_route() Fix linux-user crashes in ioctl(SIOCGIFCONF) when ifc_buf is NULL. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/fd-trans.c')
| -rw-r--r-- | linux-user/fd-trans.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c index 216b9f0614..30425c9df6 100644 --- a/linux-user/fd-trans.c +++ b/linux-user/fd-trans.c @@ -129,6 +129,8 @@ enum { QEMU_IFLA_CARRIER_UP_COUNT, QEMU_IFLA_CARRIER_DOWN_COUNT, QEMU_IFLA_NEW_IFINDEX, + QEMU_IFLA_MIN_MTU, + QEMU_IFLA_MAX_MTU, QEMU___IFLA_MAX }; @@ -166,6 +168,8 @@ enum { QEMU_IFLA_BRPORT_BCAST_FLOOD, QEMU_IFLA_BRPORT_GROUP_FWD_MASK, QEMU_IFLA_BRPORT_NEIGH_SUPPRESS, + QEMU_IFLA_BRPORT_ISOLATED, + QEMU_IFLA_BRPORT_BACKUP_PORT, QEMU___IFLA_BRPORT_MAX }; @@ -510,6 +514,7 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, case QEMU_IFLA_BRPORT_VLAN_TUNNEL: case QEMU_IFLA_BRPORT_BCAST_FLOOD: case QEMU_IFLA_BRPORT_NEIGH_SUPPRESS: + case QEMU_IFLA_BRPORT_ISOLATED: break; /* uint16_t */ case QEMU_IFLA_BRPORT_PRIORITY: @@ -523,6 +528,7 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, break; /* uin32_t */ case QEMU_IFLA_BRPORT_COST: + case QEMU_IFLA_BRPORT_BACKUP_PORT: u32 = NLA_DATA(nlattr); *u32 = tswap32(*u32); break; @@ -787,6 +793,8 @@ static abi_long host_to_target_data_link_rtattr(struct rtattr *rtattr) case QEMU_IFLA_GSO_MAX_SIZE: case QEMU_IFLA_CARRIER_UP_COUNT: case QEMU_IFLA_CARRIER_DOWN_COUNT: + case QEMU_IFLA_MIN_MTU: + case QEMU_IFLA_MAX_MTU: u32 = RTA_DATA(rtattr); *u32 = tswap32(*u32); break; |