* [PATCH v1 0/4] Missing endianness conversions in user mode
@ 2023-02-17 16:35 Mathis Marion
2023-02-17 16:35 ` [PATCH v1 1/4] linux-user: fix timerfd read endianness conversion Mathis Marion
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Mathis Marion @ 2023-02-17 16:35 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-devel, Jérôme Pouiller, Mathis Marion
From: Mathis Marion <mathis.marion@silabs.com>
For a bit of context, I was trying to test a network border router [1]
daemon using the MIPS architecture (see [2]). I didn't have access to
real MIPS hardware so I figured I would emulate it using QEMU user mode.
I ran into a couple of problems all related to endianness conversion for
syscalls between host and target as MIPS is big endian and my x86 host
is little.
[1]: https://github.com/SiliconLabs/wisun-br-linux
[2]: https://github.com/SiliconLabs/wisun-br-linux/issues/5
Mathis Marion (4):
linux-user: fix timerfd read endianness conversion
linux-user: fix sockaddr_in6 endianness
linux-user: add target to host netlink conversions
linux-user: handle netlink flag NLA_F_NESTED
linux-user/fd-trans.c | 76 ++++++++++++++++++++++++++++++++++++++++---
linux-user/fd-trans.h | 1 +
linux-user/syscall.c | 14 ++++++--
3 files changed, 85 insertions(+), 6 deletions(-)
--
2.39.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v1 1/4] linux-user: fix timerfd read endianness conversion
2023-02-17 16:35 [PATCH v1 0/4] Missing endianness conversions in user mode Mathis Marion
@ 2023-02-17 16:35 ` Mathis Marion
2023-02-17 16:35 ` [PATCH v1 2/4] linux-user: fix sockaddr_in6 endianness Mathis Marion
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Mathis Marion @ 2023-02-17 16:35 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-devel, Jérôme Pouiller, Mathis Marion
From: Mathis Marion <mathis.marion@silabs.com>
When reading the expiration count from a timerfd, the endianness of the
64bit value read is the one of the host, just as for eventfds.
Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
---
linux-user/fd-trans.c | 10 +++++++---
linux-user/fd-trans.h | 1 +
linux-user/syscall.c | 8 ++++++--
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
index 7b25468d02..146aaaafaa 100644
--- a/linux-user/fd-trans.c
+++ b/linux-user/fd-trans.c
@@ -1622,7 +1622,7 @@ TargetFdTrans target_signalfd_trans = {
.host_to_target_data = host_to_target_data_signalfd,
};
-static abi_long swap_data_eventfd(void *buf, size_t len)
+static abi_long swap_data_u64(void *buf, size_t len)
{
uint64_t *counter = buf;
int i;
@@ -1640,8 +1640,12 @@ static abi_long swap_data_eventfd(void *buf, size_t len)
}
TargetFdTrans target_eventfd_trans = {
- .host_to_target_data = swap_data_eventfd,
- .target_to_host_data = swap_data_eventfd,
+ .host_to_target_data = swap_data_u64,
+ .target_to_host_data = swap_data_u64,
+};
+
+TargetFdTrans target_timerfd_trans = {
+ .host_to_target_data = swap_data_u64,
};
#if defined(CONFIG_INOTIFY) && (defined(TARGET_NR_inotify_init) || \
diff --git a/linux-user/fd-trans.h b/linux-user/fd-trans.h
index 1b9fa2041c..910faaf237 100644
--- a/linux-user/fd-trans.h
+++ b/linux-user/fd-trans.h
@@ -130,6 +130,7 @@ extern TargetFdTrans target_netlink_route_trans;
extern TargetFdTrans target_netlink_audit_trans;
extern TargetFdTrans target_signalfd_trans;
extern TargetFdTrans target_eventfd_trans;
+extern TargetFdTrans target_timerfd_trans;
#if (defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)) || \
(defined(CONFIG_INOTIFY1) && defined(TARGET_NR_inotify_init1) && \
defined(__NR_inotify_init1))
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1e868e9b0e..58549de125 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -13117,8 +13117,12 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
#if defined(TARGET_NR_timerfd_create) && defined(CONFIG_TIMERFD)
case TARGET_NR_timerfd_create:
- return get_errno(timerfd_create(arg1,
- target_to_host_bitmask(arg2, fcntl_flags_tbl)));
+ ret = get_errno(timerfd_create(arg1,
+ target_to_host_bitmask(arg2, fcntl_flags_tbl)));
+ if (ret >= 0) {
+ fd_trans_register(ret, &target_timerfd_trans);
+ }
+ return ret;
#endif
#if defined(TARGET_NR_timerfd_gettime) && defined(CONFIG_TIMERFD)
--
2.39.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v1 2/4] linux-user: fix sockaddr_in6 endianness
2023-02-17 16:35 [PATCH v1 0/4] Missing endianness conversions in user mode Mathis Marion
2023-02-17 16:35 ` [PATCH v1 1/4] linux-user: fix timerfd read endianness conversion Mathis Marion
@ 2023-02-17 16:35 ` Mathis Marion
2023-02-17 18:20 ` Philippe Mathieu-Daudé
2023-02-17 16:35 ` [PATCH v1 3/4] linux-user: add target to host netlink conversions Mathis Marion
2023-02-17 16:35 ` [PATCH v1 4/4] linux-user: handle netlink flag NLA_F_NESTED Mathis Marion
3 siblings, 1 reply; 9+ messages in thread
From: Mathis Marion @ 2023-02-17 16:35 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-devel, Jérôme Pouiller, Mathis Marion
From: Mathis Marion <mathis.marion@silabs.com>
Fields sin6_flowinfo and sin6_scope_id use the host byte order, so there
is a conversion to be made when host and target endianness differ.
Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
---
linux-user/syscall.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 58549de125..1a6856abec 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1713,6 +1713,12 @@ static inline abi_long target_to_host_sockaddr(int fd, struct sockaddr *addr,
lladdr = (struct target_sockaddr_ll *)addr;
lladdr->sll_ifindex = tswap32(lladdr->sll_ifindex);
lladdr->sll_hatype = tswap16(lladdr->sll_hatype);
+ } else if (sa_family == AF_INET6) {
+ struct sockaddr_in6 *in6addr;
+
+ in6addr = (struct sockaddr_in6 *)addr;
+ in6addr->sin6_flowinfo = tswap32(in6addr->sin6_flowinfo);
+ in6addr->sin6_scope_id = tswap32(in6addr->sin6_scope_id);
}
unlock_user(target_saddr, target_addr, 0);
--
2.39.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v1 3/4] linux-user: add target to host netlink conversions
2023-02-17 16:35 [PATCH v1 0/4] Missing endianness conversions in user mode Mathis Marion
2023-02-17 16:35 ` [PATCH v1 1/4] linux-user: fix timerfd read endianness conversion Mathis Marion
2023-02-17 16:35 ` [PATCH v1 2/4] linux-user: fix sockaddr_in6 endianness Mathis Marion
@ 2023-02-17 16:35 ` Mathis Marion
2023-02-20 7:22 ` Philippe Mathieu-Daudé
2023-02-17 16:35 ` [PATCH v1 4/4] linux-user: handle netlink flag NLA_F_NESTED Mathis Marion
3 siblings, 1 reply; 9+ messages in thread
From: Mathis Marion @ 2023-02-17 16:35 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-devel, Jérôme Pouiller, Mathis Marion
From: Mathis Marion <mathis.marion@silabs.com>
Added conversions for:
- IFLA_MTU
- IFLA_TXQLEN
- IFLA_AF_SPEC AF_INET6 IFLA_INET6_ADDR_GEN_MODE
These relate to the libnl functions rtnl_link_set_mtu,
rtnl_link_set_txqlen, and rtnl_link_inet6_set_addr_gen_mode.
Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
---
linux-user/fd-trans.c | 64 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
index 146aaaafaa..aa398098ec 100644
--- a/linux-user/fd-trans.c
+++ b/linux-user/fd-trans.c
@@ -1284,6 +1284,49 @@ static inline abi_long host_to_target_nlmsg_route(struct nlmsghdr *nlh,
return host_to_target_for_each_nlmsg(nlh, len, host_to_target_data_route);
}
+static abi_long target_to_host_for_each_nlattr(struct nlattr *nlattr,
+ size_t len, void *context,
+ abi_long (*target_to_host_nlattr)
+ (struct nlattr *))
+{
+ unsigned short aligned_nla_len;
+ abi_long ret;
+
+ while (len > sizeof(struct nlattr)) {
+ if (tswap16(nlattr->nla_len) < sizeof(struct rtattr) ||
+ tswap16(nlattr->nla_len) > len) {
+ break;
+ }
+ nlattr->nla_len = tswap16(nlattr->nla_len);
+ nlattr->nla_type = tswap16(nlattr->nla_type);
+ ret = target_to_host_nlattr(nlattr);
+ if (ret < 0) {
+ return ret;
+ }
+
+ aligned_nla_len = NLA_ALIGN(nlattr->nla_len);
+ if (aligned_nla_len >= len) {
+ break;
+ }
+ len -= aligned_nla_len;
+ nlattr = (struct nlattr *)(((char *)nlattr) + aligned_nla_len);
+ }
+ return 0;
+}
+
+static abi_long target_to_host_data_inet6_nlattr(struct nlattr *nlattr)
+{
+ switch (nlattr->nla_type) {
+ /* uint8_t */
+ case QEMU_IFLA_INET6_ADDR_GEN_MODE:
+ break;
+ default:
+ qemu_log_mask(LOG_UNIMP, "Unknown target AF_INET6 type: %d\n",
+ nlattr->nla_type);
+ }
+ return 0;
+}
+
static abi_long target_to_host_for_each_rtattr(struct rtattr *rtattr,
size_t len,
abi_long (*target_to_host_rtattr)
@@ -1314,16 +1357,37 @@ static abi_long target_to_host_for_each_rtattr(struct rtattr *rtattr,
return 0;
}
+static abi_long target_to_host_data_spec_nlattr(struct nlattr *nlattr)
+{
+ switch (nlattr->nla_type) {
+ case AF_INET6:
+ return target_to_host_for_each_nlattr(NLA_DATA(nlattr), nlattr->nla_len,
+ NULL,
+ target_to_host_data_inet6_nlattr);
+ default:
+ qemu_log_mask(LOG_UNIMP, "Unknown target AF_SPEC type: %d\n",
+ nlattr->nla_type);
+ break;
+ }
+ return 0;
+}
+
static abi_long target_to_host_data_link_rtattr(struct rtattr *rtattr)
{
uint32_t *u32;
switch (rtattr->rta_type) {
/* uint32_t */
+ case QEMU_IFLA_MTU:
+ case QEMU_IFLA_TXQLEN:
case QEMU_IFLA_EXT_MASK:
u32 = RTA_DATA(rtattr);
*u32 = tswap32(*u32);
break;
+ case QEMU_IFLA_AF_SPEC:
+ return target_to_host_for_each_nlattr(RTA_DATA(rtattr), rtattr->rta_len,
+ NULL,
+ target_to_host_data_spec_nlattr);
default:
qemu_log_mask(LOG_UNIMP, "Unknown target QEMU_IFLA type: %d\n",
rtattr->rta_type);
--
2.39.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v1 4/4] linux-user: handle netlink flag NLA_F_NESTED
2023-02-17 16:35 [PATCH v1 0/4] Missing endianness conversions in user mode Mathis Marion
` (2 preceding siblings ...)
2023-02-17 16:35 ` [PATCH v1 3/4] linux-user: add target to host netlink conversions Mathis Marion
@ 2023-02-17 16:35 ` Mathis Marion
3 siblings, 0 replies; 9+ messages in thread
From: Mathis Marion @ 2023-02-17 16:35 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-devel, Jérôme Pouiller, Mathis Marion
From: Mathis Marion <mathis.marion@silabs.com>
Newer kernel versions require this flag to be present contrary to older
ones. Depending on the libnl version it is added or not.
Typically when using rtnl_link_inet6_set_addr_gen_mode, the netlink
packet generated may contain the following attribute:
with libnl 3.4
{nla_len=16, nla_type=IFLA_AF_SPEC},
[
{nla_len=12, nla_type=AF_INET6},
[{nla_len=5, nla_type=IFLA_INET6_ADDR_GEN_MODE}, IN6_ADDR_GEN_MODE_NONE]
]
with libnl 3.7
{nla_len=16, nla_type=NLA_F_NESTED|IFLA_AF_SPEC},
[
{nla_len=12, nla_type=NLA_F_NESTED|AF_INET6},
[{nla_len=5, nla_type=IFLA_INET6_ADDR_GEN_MODE}, IN6_ADDR_GEN_MODE_NONE]]
]
Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
---
linux-user/fd-trans.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
index aa398098ec..790f8bbcf4 100644
--- a/linux-user/fd-trans.c
+++ b/linux-user/fd-trans.c
@@ -1359,7 +1359,7 @@ static abi_long target_to_host_for_each_rtattr(struct rtattr *rtattr,
static abi_long target_to_host_data_spec_nlattr(struct nlattr *nlattr)
{
- switch (nlattr->nla_type) {
+ switch (nlattr->nla_type & ~NLA_F_NESTED) {
case AF_INET6:
return target_to_host_for_each_nlattr(NLA_DATA(nlattr), nlattr->nla_len,
NULL,
@@ -1376,7 +1376,7 @@ static abi_long target_to_host_data_link_rtattr(struct rtattr *rtattr)
{
uint32_t *u32;
- switch (rtattr->rta_type) {
+ switch (rtattr->rta_type & ~NLA_F_NESTED) {
/* uint32_t */
case QEMU_IFLA_MTU:
case QEMU_IFLA_TXQLEN:
--
2.39.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v1 2/4] linux-user: fix sockaddr_in6 endianness
2023-02-17 16:35 ` [PATCH v1 2/4] linux-user: fix sockaddr_in6 endianness Mathis Marion
@ 2023-02-17 18:20 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-02-17 18:20 UTC (permalink / raw)
To: Mathis Marion, Laurent Vivier; +Cc: qemu-devel, Jérôme Pouiller
On 17/2/23 17:35, Mathis Marion wrote:
> From: Mathis Marion <mathis.marion@silabs.com>
>
> Fields sin6_flowinfo and sin6_scope_id use the host byte order, so there
> is a conversion to be made when host and target endianness differ.
>
> Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
> ---
> linux-user/syscall.c | 6 ++++++
> 1 file changed, 6 insertions(+)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1 3/4] linux-user: add target to host netlink conversions
2023-02-17 16:35 ` [PATCH v1 3/4] linux-user: add target to host netlink conversions Mathis Marion
@ 2023-02-20 7:22 ` Philippe Mathieu-Daudé
2023-02-20 8:24 ` Mathis MARION
0 siblings, 1 reply; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-02-20 7:22 UTC (permalink / raw)
To: Mathis Marion, Laurent Vivier; +Cc: qemu-devel, Jérôme Pouiller
On 17/2/23 17:35, Mathis Marion wrote:
> From: Mathis Marion <mathis.marion@silabs.com>
>
> Added conversions for:
> - IFLA_MTU
> - IFLA_TXQLEN
> - IFLA_AF_SPEC AF_INET6 IFLA_INET6_ADDR_GEN_MODE
> These relate to the libnl functions rtnl_link_set_mtu,
> rtnl_link_set_txqlen, and rtnl_link_inet6_set_addr_gen_mode.
>
> Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
> ---
> linux-user/fd-trans.c | 64 +++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 64 insertions(+)
>
> diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
> index 146aaaafaa..aa398098ec 100644
> --- a/linux-user/fd-trans.c
> +++ b/linux-user/fd-trans.c
> @@ -1284,6 +1284,49 @@ static inline abi_long host_to_target_nlmsg_route(struct nlmsghdr *nlh,
> return host_to_target_for_each_nlmsg(nlh, len, host_to_target_data_route);
> }
>
> +static abi_long target_to_host_for_each_nlattr(struct nlattr *nlattr,
> + size_t len, void *context,
You always pass a NULL context... Do we really need it?
> + abi_long (*target_to_host_nlattr)
> + (struct nlattr *))
> +{
> + unsigned short aligned_nla_len;
> + abi_long ret;
> +
> + while (len > sizeof(struct nlattr)) {
> + if (tswap16(nlattr->nla_len) < sizeof(struct rtattr) ||
> + tswap16(nlattr->nla_len) > len) {
> + break;
> + }
> + nlattr->nla_len = tswap16(nlattr->nla_len);
> + nlattr->nla_type = tswap16(nlattr->nla_type);
> + ret = target_to_host_nlattr(nlattr);
> + if (ret < 0) {
If this fail, guest's nlattr is now inconsistent. Is this OK?
> + return ret;
> + }
> +
> + aligned_nla_len = NLA_ALIGN(nlattr->nla_len);
> + if (aligned_nla_len >= len) {
> + break;
> + }
> + len -= aligned_nla_len;
> + nlattr = (struct nlattr *)(((char *)nlattr) + aligned_nla_len);
> + }
> + return 0;
> +}
> +
> +static abi_long target_to_host_data_inet6_nlattr(struct nlattr *nlattr)
> +{
> + switch (nlattr->nla_type) {
> + /* uint8_t */
> + case QEMU_IFLA_INET6_ADDR_GEN_MODE:
> + break;
> + default:
> + qemu_log_mask(LOG_UNIMP, "Unknown target AF_INET6 type: %d\n",
> + nlattr->nla_type);
> + }
> + return 0;
> +}
> +
> static abi_long target_to_host_for_each_rtattr(struct rtattr *rtattr,
> size_t len,
> abi_long (*target_to_host_rtattr)
> @@ -1314,16 +1357,37 @@ static abi_long target_to_host_for_each_rtattr(struct rtattr *rtattr,
> return 0;
> }
>
> +static abi_long target_to_host_data_spec_nlattr(struct nlattr *nlattr)
> +{
> + switch (nlattr->nla_type) {
> + case AF_INET6:
> + return target_to_host_for_each_nlattr(NLA_DATA(nlattr), nlattr->nla_len,
> + NULL,
> + target_to_host_data_inet6_nlattr);
> + default:
> + qemu_log_mask(LOG_UNIMP, "Unknown target AF_SPEC type: %d\n",
> + nlattr->nla_type);
> + break;
> + }
> + return 0;
> +}
> +
> static abi_long target_to_host_data_link_rtattr(struct rtattr *rtattr)
> {
> uint32_t *u32;
>
> switch (rtattr->rta_type) {
> /* uint32_t */
> + case QEMU_IFLA_MTU:
> + case QEMU_IFLA_TXQLEN:
> case QEMU_IFLA_EXT_MASK:
> u32 = RTA_DATA(rtattr);
> *u32 = tswap32(*u32);
> break;
> + case QEMU_IFLA_AF_SPEC:
> + return target_to_host_for_each_nlattr(RTA_DATA(rtattr), rtattr->rta_len,
> + NULL,
> + target_to_host_data_spec_nlattr);
> default:
> qemu_log_mask(LOG_UNIMP, "Unknown target QEMU_IFLA type: %d\n",
> rtattr->rta_type);
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1 3/4] linux-user: add target to host netlink conversions
2023-02-20 7:22 ` Philippe Mathieu-Daudé
@ 2023-02-20 8:24 ` Mathis MARION
2023-02-20 9:03 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 9+ messages in thread
From: Mathis MARION @ 2023-02-20 8:24 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Mathis Marion, Laurent Vivier
Cc: qemu-devel, Jérôme Pouiller
On 20/02/2023 08:22, Philippe Mathieu-Daudé wrote:
> On 17/2/23 17:35, Mathis Marion wrote:
>> From: Mathis Marion <mathis.marion@silabs.com>
>>
>> Added conversions for:
>> - IFLA_MTU
>> - IFLA_TXQLEN
>> - IFLA_AF_SPEC AF_INET6 IFLA_INET6_ADDR_GEN_MODE
>> These relate to the libnl functions rtnl_link_set_mtu,
>> rtnl_link_set_txqlen, and rtnl_link_inet6_set_addr_gen_mode.
>>
>> Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
>> ---
>> linux-user/fd-trans.c | 64 +++++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 64 insertions(+)
>>
>> diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
>> index 146aaaafaa..aa398098ec 100644
>> --- a/linux-user/fd-trans.c
>> +++ b/linux-user/fd-trans.c
>> @@ -1284,6 +1284,49 @@ static inline abi_long
>> host_to_target_nlmsg_route(struct nlmsghdr *nlh,
>> return host_to_target_for_each_nlmsg(nlh, len,
>> host_to_target_data_route);
>> }
>>
>> +static abi_long target_to_host_for_each_nlattr(struct nlattr *nlattr,
>> + size_t len, void
>> *context,
>
> You always pass a NULL context... Do we really need it?
>
This is a leftover, I had the context in every functions as copied from
the host_to_target* variants but removed it. I just forgot about this
function.
>> + abi_long
>> (*target_to_host_nlattr)
>> + (struct
>> nlattr *))
>> +{
>> + unsigned short aligned_nla_len;
>> + abi_long ret;
>> +
>> + while (len > sizeof(struct nlattr)) {
>> + if (tswap16(nlattr->nla_len) < sizeof(struct rtattr) ||
>> + tswap16(nlattr->nla_len) > len) {
>> + break;
>> + }
>> + nlattr->nla_len = tswap16(nlattr->nla_len);
>> + nlattr->nla_type = tswap16(nlattr->nla_type);
>> + ret = target_to_host_nlattr(nlattr);
>> + if (ret < 0) {
>
> If this fail, guest's nlattr is now inconsistent. Is this OK?
>
The same check is done in target_to_host_for_each_rtattr(), and in all
host_to_target_for_each* functions so I think this is OK.
>> + return ret;
>> + }
>> +
>> + aligned_nla_len = NLA_ALIGN(nlattr->nla_len);
>> + if (aligned_nla_len >= len) {
>> + break;
>> + }
>> + len -= aligned_nla_len;
>> + nlattr = (struct nlattr *)(((char *)nlattr) + aligned_nla_len);
>> + }
>> + return 0;
>> +}
>> +
>> +static abi_long target_to_host_data_inet6_nlattr(struct nlattr *nlattr)
>> +{
>> + switch (nlattr->nla_type) {
>> + /* uint8_t */
>> + case QEMU_IFLA_INET6_ADDR_GEN_MODE:
>> + break;
>> + default:
>> + qemu_log_mask(LOG_UNIMP, "Unknown target AF_INET6 type: %d\n",
>> + nlattr->nla_type);
>> + }
>> + return 0;
>> +}
>> +
>> static abi_long target_to_host_for_each_rtattr(struct rtattr *rtattr,
>> size_t len,
>> abi_long
>> (*target_to_host_rtattr)
>> @@ -1314,16 +1357,37 @@ static abi_long
>> target_to_host_for_each_rtattr(struct rtattr *rtattr,
>> return 0;
>> }
>>
>> +static abi_long target_to_host_data_spec_nlattr(struct nlattr *nlattr)
>> +{
>> + switch (nlattr->nla_type) {
>> + case AF_INET6:
>> + return target_to_host_for_each_nlattr(NLA_DATA(nlattr),
>> nlattr->nla_len,
>> + NULL,
>> +
>> target_to_host_data_inet6_nlattr);
>> + default:
>> + qemu_log_mask(LOG_UNIMP, "Unknown target AF_SPEC type: %d\n",
>> + nlattr->nla_type);
>> + break;
>> + }
>> + return 0;
>> +}
>> +
>> static abi_long target_to_host_data_link_rtattr(struct rtattr *rtattr)
>> {
>> uint32_t *u32;
>>
>> switch (rtattr->rta_type) {
>> /* uint32_t */
>> + case QEMU_IFLA_MTU:
>> + case QEMU_IFLA_TXQLEN:
>> case QEMU_IFLA_EXT_MASK:
>> u32 = RTA_DATA(rtattr);
>> *u32 = tswap32(*u32);
>> break;
>> + case QEMU_IFLA_AF_SPEC:
>> + return target_to_host_for_each_nlattr(RTA_DATA(rtattr),
>> rtattr->rta_len,
>> + NULL,
>> +
>> target_to_host_data_spec_nlattr);
>> default:
>> qemu_log_mask(LOG_UNIMP, "Unknown target QEMU_IFLA type: %d\n",
>> rtattr->rta_type);
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1 3/4] linux-user: add target to host netlink conversions
2023-02-20 8:24 ` Mathis MARION
@ 2023-02-20 9:03 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-02-20 9:03 UTC (permalink / raw)
To: Mathis MARION, Mathis Marion, Laurent Vivier
Cc: qemu-devel, Jérôme Pouiller, Richard Henderson
On 20/2/23 09:24, Mathis MARION wrote:
> On 20/02/2023 08:22, Philippe Mathieu-Daudé wrote:
>> On 17/2/23 17:35, Mathis Marion wrote:
>>> From: Mathis Marion <mathis.marion@silabs.com>
>>>
>>> Added conversions for:
>>> - IFLA_MTU
>>> - IFLA_TXQLEN
>>> - IFLA_AF_SPEC AF_INET6 IFLA_INET6_ADDR_GEN_MODE
>>> These relate to the libnl functions rtnl_link_set_mtu,
>>> rtnl_link_set_txqlen, and rtnl_link_inet6_set_addr_gen_mode.
>>>
>>> Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
>>> ---
>>> linux-user/fd-trans.c | 64 +++++++++++++++++++++++++++++++++++++++++++
>>> 1 file changed, 64 insertions(+)
>>> + abi_long
>>> (*target_to_host_nlattr)
>>> + (struct
>>> nlattr *))
>>> +{
>>> + unsigned short aligned_nla_len;
>>> + abi_long ret;
>>> +
>>> + while (len > sizeof(struct nlattr)) {
>>> + if (tswap16(nlattr->nla_len) < sizeof(struct rtattr) ||
>>> + tswap16(nlattr->nla_len) > len) {
>>> + break;
>>> + }
>>> + nlattr->nla_len = tswap16(nlattr->nla_len);
>>> + nlattr->nla_type = tswap16(nlattr->nla_type);
>>> + ret = target_to_host_nlattr(nlattr);
>>> + if (ret < 0) {
>>
>> If this fail, guest's nlattr is now inconsistent. Is this OK?
>>
>
> The same check is done in target_to_host_for_each_rtattr(), and in all
> host_to_target_for_each* functions so I think this is OK.
Yeah this is pre-existing, so your patch is OK, but I still wonder
if this is safe. Laurent?
>>> + return ret;
>>> + }
>>> +
>>> + aligned_nla_len = NLA_ALIGN(nlattr->nla_len);
>>> + if (aligned_nla_len >= len) {
>>> + break;
>>> + }
>>> + len -= aligned_nla_len;
>>> + nlattr = (struct nlattr *)(((char *)nlattr) + aligned_nla_len);
>>> + }
>>> + return 0;
>>> +}
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-02-20 14:11 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-17 16:35 [PATCH v1 0/4] Missing endianness conversions in user mode Mathis Marion
2023-02-17 16:35 ` [PATCH v1 1/4] linux-user: fix timerfd read endianness conversion Mathis Marion
2023-02-17 16:35 ` [PATCH v1 2/4] linux-user: fix sockaddr_in6 endianness Mathis Marion
2023-02-17 18:20 ` Philippe Mathieu-Daudé
2023-02-17 16:35 ` [PATCH v1 3/4] linux-user: add target to host netlink conversions Mathis Marion
2023-02-20 7:22 ` Philippe Mathieu-Daudé
2023-02-20 8:24 ` Mathis MARION
2023-02-20 9:03 ` Philippe Mathieu-Daudé
2023-02-17 16:35 ` [PATCH v1 4/4] linux-user: handle netlink flag NLA_F_NESTED Mathis Marion
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).