linux-user: Add sockopts for IPv6 ping and IPv6 traceroute
PATCH 1/1 linux-user: Add sockopts for IPv6 ping and IPv6 traceroute
Add the neccessary sockopts for ping and traceroute on IPv6.
This fixes the following qemu warnings with IPv6:
Unsupported ancillary data: 0/2 Unsupported ancillary data: 0/11 Unsupported ancillary data: 41/25 Unsupported setsockopt level=0 optname=12 Unsupported setsockopt level=41 optname=16 Unsupported setsockopt level=41 optname=25 Unsupported setsockopt level=41 optname=51 Unsupported setsockopt level=41 optname=8 Unsupported setsockopt level=58 optname=1
Tested on hppa-linux-user.
linux-user/syscall.c +91 -0
@@ -57,6 +57,8 @@ int __clone2(int (*fn)(void *), void *child_stack_base,#include <netinet/tcp.h> #include <linux/wireless.h> #include <linux/icmp.h> +#include <linux/icmpv6.h> +#include <linux/errqueue.h> #include "qemu-common.h" #ifdef CONFIG_TIMERFD #include <sys/timerfd.h>
@@ -1839,6 +1841,78 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, }break ; +case SOL_IP : +switch (cmsg->cmsg_type) { +case IP_TTL : + { + goto copy_word; + } +case IP_RECVERR : + { +struct errhdr_t { +struct sock_extended_err ee; +struct sockaddr_in offender; + }; +struct errhdr_t *errh = (struct errhdr_t *)data; +struct errhdr_t *target_errh = + (struct errhdr_t *)target_data; + +__put_user (errh->ee.ee_errno, &target_errh->ee.ee_errno); +__put_user (errh->ee.ee_origin, &target_errh->ee.ee_origin); +__put_user (errh->ee.ee_type, &target_errh->ee.ee_type); +__put_user (errh->ee.ee_code, &target_errh->ee.ee_code); +__put_user (errh->ee.ee_pad, &target_errh->ee.ee_pad); +__put_user (errh->ee.ee_info, &target_errh->ee.ee_info); +__put_user (errh->ee.ee_data, &target_errh->ee.ee_data); +host_to_target_sockaddr ((unsigned long ) &target_errh->offender, + (void *) &errh->offender,sizeof (errh->offender)); +break ; + } +default : + goto unimplemented; + } +break ; + +case SOL_IPV6 : +switch (cmsg->cmsg_type) { +case IPV6_HOPLIMIT : + copy_word: + { +uint32_t *v = (uint32_t *)data; +uint32_t *t_int = (uint32_t *)target_data; +if (tgt_len !=CMSG_LEN (0 )) + goto unimplemented; + +__put_user (*v, t_int); +break ; + } +case IPV6_RECVERR : + { +struct errhdr6_t { +struct sock_extended_err ee; +struct sockaddr_in6 offender; + }; +struct errhdr6_t *errh = (struct errhdr6_t *)data; +struct errhdr6_t *target_errh = + (struct errhdr6_t *)target_data; + +__put_user (errh->ee.ee_errno, &target_errh->ee.ee_errno); +__put_user (errh->ee.ee_origin, &target_errh->ee.ee_origin); +__put_user (errh->ee.ee_type, &target_errh->ee.ee_type); +__put_user (errh->ee.ee_code, &target_errh->ee.ee_code); +__put_user (errh->ee.ee_pad, &target_errh->ee.ee_pad); +__put_user (errh->ee.ee_info, &target_errh->ee.ee_info); +__put_user (errh->ee.ee_data, &target_errh->ee.ee_data); + target_errh->offender = errh->offender; +__put_user (errh->offender.sin6_family, &target_errh->offender.sin6_family); +__put_user (errh->offender.sin6_scope_id, &target_errh->offender.sin6_scope_id); +break ; + } +default : + goto unimplemented; + } +break ; +default : unimplemented: gemu_log("Unsupported ancillary data: %d/%d\n",
@@ -2766,6 +2840,7 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case IP_PKTINFO :case IP_MTU_DISCOVER :case IP_RECVERR : +case IP_RECVTTL :case IP_RECVTOS :#ifdef IP_FREEBIND case IP_FREEBIND :
@@ -2815,6 +2890,10 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case IPV6_MTU :case IPV6_V6ONLY :case IPV6_RECVPKTINFO : +case IPV6_UNICAST_HOPS : +case IPV6_RECVERR : +case IPV6_RECVHOPLIMIT : +case IPV6_2292HOPLIMIT : val =0 ;if (optlen <sizeof (uint32_t )) {return -TARGET_EINVAL ;
@@ -2829,9 +2908,21 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, goto unimplemented; }break ; +case SOL_ICMPV6 : +switch (optname) { +case ICMPV6_FILTER : +case IPV6_CHECKSUM : + goto icmp_filter; +break ; +default : + goto unimplemented; + } +break ;case SOL_RAW :switch (optname) {case ICMP_FILTER : +case IPV6_CHECKSUM : + icmp_filter:/* struct icmp_filter takes an u32 value */ if (optlen <sizeof (uint32_t )) {return -TARGET_EINVAL ;
Hi Helge,
I tested your patch with qemu-x86_64 /bin/ping6 but still had this warning:
Unsupported setsockopt level=41 optname=50
adding SOL_IPV6/IPV6_PKTINFO silent it.
Quoted 13 lines · Helge Deller
Add the neccessary sockopts for ping and traceroute on IPv6.
This fixes the following qemu warnings with IPv6:
Unsupported ancillary data: 0/2 Unsupported ancillary data: 0/11 Unsupported ancillary data: 41/25 Unsupported setsockopt level=0 optname=12 Unsupported setsockopt level=41 optname=16 Unsupported setsockopt level=41 optname=25 Unsupported setsockopt level=41 optname=51 Unsupported setsockopt level=41 optname=8 Unsupported setsockopt level=58 optname=1
Quoted 4 lines
Tested on hppa-linux-user.
Signed-off-by Helge Deller <[email protected]>
and with IPV6_PKTINFO:
Quoted 102 lines
linux-user/syscall.c +75
-0@@ -57,6 +57,8 @@ int __clone2(int (*fn)(void *), void *child_stack_base,#include <netinet/tcp.h> #include <linux/wireless.h> #include <linux/icmp.h> +#include <linux/icmpv6.h> +#include <linux/errqueue.h> #include "qemu-common.h" #ifdef CONFIG_TIMERFD #include <sys/timerfd.h> @@ -1839,6 +1841,78 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, }break ; +case SOL_IP : +switch (cmsg->cmsg_type) { +case IP_TTL : + { + goto copy_word; + } +case IP_RECVERR : + { +struct errhdr_t { +struct sock_extended_err ee; +struct sockaddr_in offender; + }; +struct errhdr_t *errh = (struct errhdr_t *)data; +struct errhdr_t *target_errh = + (struct errhdr_t *)target_data; + +__put_user (errh->ee.ee_errno, &target_errh->ee.ee_errno); +__put_user (errh->ee.ee_origin, &target_errh->ee.ee_origin); +__put_user (errh->ee.ee_type, &target_errh->ee.ee_type); +__put_user (errh->ee.ee_code, &target_errh->ee.ee_code); +__put_user (errh->ee.ee_pad, &target_errh->ee.ee_pad); +__put_user (errh->ee.ee_info, &target_errh->ee.ee_info); +__put_user (errh->ee.ee_data, &target_errh->ee.ee_data); +host_to_target_sockaddr ((unsigned long ) &target_errh->offender, + (void *) &errh->offender,sizeof (errh->offender)); +break ; + } +default : + goto unimplemented; + } +break ; + +case SOL_IPV6 : +switch (cmsg->cmsg_type) { +case IPV6_HOPLIMIT : + copy_word: + { +uint32_t *v = (uint32_t *)data; +uint32_t *t_int = (uint32_t *)target_data; +if (tgt_len !=CMSG_LEN (0 )) + goto unimplemented; + +__put_user (*v, t_int); +break ; + } +case IPV6_RECVERR : + { +struct errhdr6_t { +struct sock_extended_err ee; +struct sockaddr_in6 offender; + }; +struct errhdr6_t *errh = (struct errhdr6_t *)data; +struct errhdr6_t *target_errh = + (struct errhdr6_t *)target_data; + +__put_user (errh->ee.ee_errno, &target_errh->ee.ee_errno); +__put_user (errh->ee.ee_origin, &target_errh->ee.ee_origin); +__put_user (errh->ee.ee_type, &target_errh->ee.ee_type); +__put_user (errh->ee.ee_code, &target_errh->ee.ee_code); +__put_user (errh->ee.ee_pad, &target_errh->ee.ee_pad); +__put_user (errh->ee.ee_info, &target_errh->ee.ee_info); +__put_user (errh->ee.ee_data, &target_errh->ee.ee_data); + target_errh->offender = errh->offender; +__put_user (errh->offender.sin6_family, &target_errh->offender.sin6_family); +__put_user (errh->offender.sin6_scope_id, &target_errh->offender.sin6_scope_id); +break ; + } +default : + goto unimplemented; + } +break ; +default : unimplemented: gemu_log("Unsupported ancillary data: %d/%d\n",@@ -2766,6 +2840,7 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case IP_PKTINFO :case IP_MTU_DISCOVER :case IP_RECVERR : +case IP_RECVTTL :case IP_RECVTOS :#ifdef IP_FREEBIND case IP_FREEBIND :
linux-user/syscall.c static abi_long do_setsockopt(int sockfd, int level, int optname, · line 2894
Quoted 5 lines
linux-user/syscall.c +2
-0@@ -2815,6 +2890,10 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case IPV6_MTU :case IPV6_V6ONLY :case IPV6_RECVPKTINFO : +case IPV6_UNICAST_HOPS : +case IPV6_RECVERR :
+ case IPV6_PKTINFO:
Quoted 28 lines
linux-user/syscall.c +14
-0+case IPV6_RECVHOPLIMIT : +case IPV6_2292HOPLIMIT : val =0 ;if (optlen <sizeof (uint32_t )) {return -TARGET_EINVAL ;@@ -2829,9 +2908,21 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, goto unimplemented; }break ; +case SOL_ICMPV6 : +switch (optname) { +case ICMPV6_FILTER : +case IPV6_CHECKSUM : + goto icmp_filter; +break ; +default : + goto unimplemented; + } +break ;case SOL_RAW :switch (optname) {case ICMP_FILTER : +case IPV6_CHECKSUM : + icmp_filter:/* struct icmp_filter takes an u32 value */ if (optlen <sizeof (uint32_t )) {return -TARGET_EINVAL ;
PATCH v2 1/1 linux-user: Add sockopts for IPv6 ping and IPv6 traceroute
Add the neccessary sockopts for ping and traceroute on IPv6.
This fixes the following qemu warnings with IPv6:
Unsupported ancillary data: 0/2 Unsupported ancillary data: 0/11 Unsupported ancillary data: 41/25 Unsupported setsockopt level=0 optname=12 Unsupported setsockopt level=41 optname=16 Unsupported setsockopt level=41 optname=25 Unsupported setsockopt level=41 optname=50 Unsupported setsockopt level=41 optname=51 Unsupported setsockopt level=41 optname=8 Unsupported setsockopt level=58 optname=1
Tested on hppa-linux-user and x86_64-linux-user.
Changes to v1:
- Added IPV6_PKTINFO sockopt as reported by Philippe Mathieu-Daudé
linux-user/syscall.c +92 -0
@@ -57,6 +57,8 @@ int __clone2(int (*fn)(void *), void *child_stack_base,#include <netinet/tcp.h> #include <linux/wireless.h> #include <linux/icmp.h> +#include <linux/icmpv6.h> +#include <linux/errqueue.h> #include "qemu-common.h" #ifdef CONFIG_TIMERFD #include <sys/timerfd.h>
@@ -1839,6 +1841,78 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, }break ; +case SOL_IP : +switch (cmsg->cmsg_type) { +case IP_TTL : + { + goto copy_word; + } +case IP_RECVERR : + { +struct errhdr_t { +struct sock_extended_err ee; +struct sockaddr_in offender; + }; +struct errhdr_t *errh = (struct errhdr_t *)data; +struct errhdr_t *target_errh = + (struct errhdr_t *)target_data; + +__put_user (errh->ee.ee_errno, &target_errh->ee.ee_errno); +__put_user (errh->ee.ee_origin, &target_errh->ee.ee_origin); +__put_user (errh->ee.ee_type, &target_errh->ee.ee_type); +__put_user (errh->ee.ee_code, &target_errh->ee.ee_code); +__put_user (errh->ee.ee_pad, &target_errh->ee.ee_pad); +__put_user (errh->ee.ee_info, &target_errh->ee.ee_info); +__put_user (errh->ee.ee_data, &target_errh->ee.ee_data); +host_to_target_sockaddr ((unsigned long ) &target_errh->offender, + (void *) &errh->offender,sizeof (errh->offender)); +break ; + } +default : + goto unimplemented; + } +break ; + +case SOL_IPV6 : +switch (cmsg->cmsg_type) { +case IPV6_HOPLIMIT : + copy_word: + { +uint32_t *v = (uint32_t *)data; +uint32_t *t_int = (uint32_t *)target_data; +if (tgt_len !=CMSG_LEN (0 )) + goto unimplemented; + +__put_user (*v, t_int); +break ; + } +case IPV6_RECVERR : + { +struct errhdr6_t { +struct sock_extended_err ee; +struct sockaddr_in6 offender; + }; +struct errhdr6_t *errh = (struct errhdr6_t *)data; +struct errhdr6_t *target_errh = + (struct errhdr6_t *)target_data; + +__put_user (errh->ee.ee_errno, &target_errh->ee.ee_errno); +__put_user (errh->ee.ee_origin, &target_errh->ee.ee_origin); +__put_user (errh->ee.ee_type, &target_errh->ee.ee_type); +__put_user (errh->ee.ee_code, &target_errh->ee.ee_code); +__put_user (errh->ee.ee_pad, &target_errh->ee.ee_pad); +__put_user (errh->ee.ee_info, &target_errh->ee.ee_info); +__put_user (errh->ee.ee_data, &target_errh->ee.ee_data); + target_errh->offender = errh->offender; +__put_user (errh->offender.sin6_family, &target_errh->offender.sin6_family); +__put_user (errh->offender.sin6_scope_id, &target_errh->offender.sin6_scope_id); +break ; + } +default : + goto unimplemented; + } +break ; +default : unimplemented: gemu_log("Unsupported ancillary data: %d/%d\n",
@@ -2766,6 +2840,7 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case IP_PKTINFO :case IP_MTU_DISCOVER :case IP_RECVERR : +case IP_RECVTTL :case IP_RECVTOS :#ifdef IP_FREEBIND case IP_FREEBIND :
@@ -2815,6 +2890,11 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case IPV6_MTU :case IPV6_V6ONLY :case IPV6_RECVPKTINFO : +case IPV6_UNICAST_HOPS : +case IPV6_RECVERR : +case IPV6_PKTINFO : +case IPV6_RECVHOPLIMIT : +case IPV6_2292HOPLIMIT : val =0 ;if (optlen <sizeof (uint32_t )) {return -TARGET_EINVAL ;
@@ -2829,9 +2909,21 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, goto unimplemented; }break ; +case SOL_ICMPV6 : +switch (optname) { +case ICMPV6_FILTER : +case IPV6_CHECKSUM : + goto icmp_filter; +break ; +default : + goto unimplemented; + } +break ;case SOL_RAW :switch (optname) {case ICMP_FILTER : +case IPV6_CHECKSUM : + icmp_filter:/* struct icmp_filter takes an u32 value */ if (optlen <sizeof (uint32_t )) {return -TARGET_EINVAL ;
Quoted 14 lines · Helge Deller
Add the neccessary sockopts for ping and traceroute on IPv6.
This fixes the following qemu warnings with IPv6:
Unsupported ancillary data: 0/2 Unsupported ancillary data: 0/11 Unsupported ancillary data: 41/25 Unsupported setsockopt level=0 optname=12 Unsupported setsockopt level=41 optname=16 Unsupported setsockopt level=41 optname=25 Unsupported setsockopt level=41 optname=50 Unsupported setsockopt level=41 optname=51 Unsupported setsockopt level=41 optname=8 Unsupported setsockopt level=58 optname=1
Quoted 4 lines
Tested on hppa-linux-user and x86_64-linux-user.
Changes to v1:
- AddedIPV6_PKTINFOsockopt as reported by Philippe Mathieu-Daudé
Please, add the version comment after the "---" marker (BTW, where is it?)
Quoted 4 lines
Signed-off-by Helge Deller <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
("---" should be here, you should use "git send-email"...)
Quoted 15 lines
linux-user/syscall.c +2
-0@@ -57,6 +57,8 @@ int __clone2(int (*fn)(void *), void *child_stack_base,#include <netinet/tcp.h> #include <linux/wireless.h> #include <linux/icmp.h> +#include <linux/icmpv6.h> +#include <linux/errqueue.h> #include "qemu-common.h" #ifdef CONFIG_TIMERFD #include <sys/timerfd.h>
linux-user/syscall.c static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, · line 1848
Quoted 8 lines
linux-user/syscall.c +5
-0@@ -1839,6 +1841,78 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, }break ; +case SOL_IP : +switch (cmsg->cmsg_type) { +case IP_TTL : + { + goto copy_word;
Not sure a "goto" between "SOL_*" cases is a good idea.
Quoted 50 lines
linux-user/syscall.c +50
-0+ } +case IP_RECVERR : + { +struct errhdr_t { +struct sock_extended_err ee; +struct sockaddr_in offender; + }; +struct errhdr_t *errh = (struct errhdr_t *)data; +struct errhdr_t *target_errh = + (struct errhdr_t *)target_data; + +__put_user (errh->ee.ee_errno, &target_errh->ee.ee_errno); +__put_user (errh->ee.ee_origin, &target_errh->ee.ee_origin); +__put_user (errh->ee.ee_type, &target_errh->ee.ee_type); +__put_user (errh->ee.ee_code, &target_errh->ee.ee_code); +__put_user (errh->ee.ee_pad, &target_errh->ee.ee_pad); +__put_user (errh->ee.ee_info, &target_errh->ee.ee_info); +__put_user (errh->ee.ee_data, &target_errh->ee.ee_data); +host_to_target_sockaddr ((unsigned long ) &target_errh->offender, + (void *) &errh->offender,sizeof (errh->offender)); +break ; + } +default : + goto unimplemented; + } +break ; + +case SOL_IPV6 : +switch (cmsg->cmsg_type) { +case IPV6_HOPLIMIT : + copy_word: + { +uint32_t *v = (uint32_t *)data; +uint32_t *t_int = (uint32_t *)target_data; +if (tgt_len !=CMSG_LEN (0 )) + goto unimplemented; + +__put_user (*v, t_int); +break ; + } +case IPV6_RECVERR : + { +struct errhdr6_t { +struct sock_extended_err ee; +struct sockaddr_in6 offender; + }; +struct errhdr6_t *errh = (struct errhdr6_t *)data; +struct errhdr6_t *target_errh = + (struct errhdr6_t *)target_data; +
linux-user/syscall.c static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, · line 1908
Quoted 10 lines
linux-user/syscall.c +10
-0+__put_user (errh->ee.ee_errno, &target_errh->ee.ee_errno); +__put_user (errh->ee.ee_origin, &target_errh->ee.ee_origin); +__put_user (errh->ee.ee_type, &target_errh->ee.ee_type); +__put_user (errh->ee.ee_code, &target_errh->ee.ee_code); +__put_user (errh->ee.ee_pad, &target_errh->ee.ee_pad); +__put_user (errh->ee.ee_info, &target_errh->ee.ee_info); +__put_user (errh->ee.ee_data, &target_errh->ee.ee_data); + target_errh->offender = errh->offender; +__put_user (errh->offender.sin6_family, &target_errh->offender.sin6_family); +__put_user (errh->offender.sin6_scope_id, &target_errh->offender.sin6_scope_id);
Perhaps you can put this in host_to_target_sockaddr()? [I don't know IPv6]
Quoted 19 lines
linux-user/syscall.c +8
-0+break ; + } +default : + goto unimplemented; + } +break ; +default : unimplemented: gemu_log("Unsupported ancillary data: %d/%d\n",@@ -2766,6 +2840,7 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case IP_PKTINFO :case IP_MTU_DISCOVER :case IP_RECVERR : +case IP_RECVTTL :case IP_RECVTOS :#ifdef IP_FREEBIND case IP_FREEBIND :
linux-user/syscall.c static abi_long do_setsockopt(int sockfd, int level, int optname, · line 2895
Quoted 6 lines
linux-user/syscall.c +3
-0@@ -2815,6 +2890,11 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case IPV6_MTU :case IPV6_V6ONLY :case IPV6_RECVPKTINFO : +case IPV6_UNICAST_HOPS : +case IPV6_RECVERR : +case IPV6_PKTINFO :
It doesn't use an uint32_t but an in6_pktinfo.
linux-user/syscall.c static abi_long do_setsockopt(int sockfd, int level, int optname, · line 2915
Quoted 13 lines
linux-user/syscall.c +6
-0+case IPV6_RECVHOPLIMIT : +case IPV6_2292HOPLIMIT : val =0 ;if (optlen <sizeof (uint32_t )) {return -TARGET_EINVAL ;@@ -2829,9 +2909,21 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, goto unimplemented; }break ; +case SOL_ICMPV6 : +switch (optname) { +case ICMPV6_FILTER : +case IPV6_CHECKSUM :
IPV6_CHECKSUM, should be in "case SOL_IPV6"
linux-user/syscall.c static abi_long do_setsockopt(int sockfd, int level, int optname, · line 2916
Quoted 1 line
linux-user/syscall.c +1
-0+ goto icmp_filter;
I think the "goto" is not a good idea, IMHO you should copy the code (it's what it is done for every "case SOL_*").
Moreover icmp_filter is:
struct icmp_filter {
__u32 data;
};while icmpv6_filter is:
struct icmp6_filter {
__u32 data[8];
};So you can't use the same code.
Quoted 4 lines
linux-user/syscall.c +3
-0+break ; +default : + goto unimplemented;
linux-user/syscall.c static abi_long do_setsockopt(int sockfd, int level, int optname, · line 2929
Quoted 10 lines
linux-user/syscall.c +4
-0+ } +break ;case SOL_RAW :switch (optname) {case ICMP_FILTER : +case IPV6_CHECKSUM : + icmp_filter:/* struct icmp_filter takes an u32 value */ if (optlen <sizeof (uint32_t )) {return -TARGET_EINVAL ;
Thanks,
Laurent
PATCH v3 1/1 linux-user: Add sockopts for IPv6 ping and IPv6 traceroute
In reply to Helge DellerAdd the neccessary sockopts for ping and traceroute on IPv6.
This fixes the following qemu warnings with IPv6:
Unsupported ancillary data: 0/2 Unsupported ancillary data: 0/11 Unsupported ancillary data: 41/25 Unsupported setsockopt level=0 optname=12 Unsupported setsockopt level=41 optname=16 Unsupported setsockopt level=41 optname=25 Unsupported setsockopt level=41 optname=50 Unsupported setsockopt level=41 optname=51 Unsupported setsockopt level=41 optname=8 Unsupported setsockopt level=58 optname=1
Tested with hppa-linux-user (big-endian) on x86_64 (little-endian).
---
Changes to v2: (all suggested by Laurent Vivier)
- Drop goto statements and replaced by real code
- New function host_to_target_sockaddr_in6()
- Fix IPV6_PKTINFO which uses in6_pktinfo instead of uint32_t
- Move one IPV6_CHECKSUM from SOL_ICMPV6 to SOL_IPV6
- Fix ICMPV6_FILTER to use icmpv6_filter
Changes to v1:
- Added IPV6_PKTINFO sockopt as reported by Philippe Mathieu-Daudé
linux-user/syscall.c +157 -1
@@ -57,6 +57,8 @@ int __clone2(int (*fn)(void *), void *child_stack_base,#include <netinet/tcp.h> #include <linux/wireless.h> #include <linux/icmp.h> +#include <linux/icmpv6.h> +#include <linux/errqueue.h> #include "qemu-common.h" #ifdef CONFIG_TIMERFD #include <sys/timerfd.h>
@@ -1640,6 +1642,33 @@ static inline abi_long host_to_target_sockaddr(abi_ulong target_addr,return 0 ; } +static inline abi_long host_to_target_sockaddr_in6 (abi_ulong target_addr, +struct sockaddr_in6 *addr, +socklen_t len) +{ +struct target_sockaddr_in6 *target_saddr; + +if (len ==0 ) { +return 0 ; + } + + target_saddr =lock_user (VERIFY_WRITE , target_addr, len,0 ); +if (!target_saddr) +return -TARGET_EFAULT ; +memcpy (target_saddr, addr, len); +if (len >= offsetof(struct target_sockaddr_in6 , sin6_family) + +sizeof (target_saddr->sin6_family)) { + target_saddr->sin6_family =tswap16 (addr->sin6_family); + } +if (len >= offsetof(struct target_sockaddr_in6 , sin6_scope_id) + +sizeof (target_saddr->sin6_scope_id)) { + target_saddr->sin6_scope_id =tswap16 (addr->sin6_scope_id); + } +unlock_user (target_saddr, target_addr, len); + +return 0 ; +} +static inline abi_long target_to_host_cmsg (struct msghdr *msgh,struct target_msghdr *target_msgh) {
@@ -1839,6 +1868,82 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, }break ; +case SOL_IP : +switch (cmsg->cmsg_type) { +case IP_TTL : + { +uint32_t *v = (uint32_t *)data; +uint32_t *t_int = (uint32_t *)target_data; +if (tgt_len !=CMSG_LEN (0 )) + goto unimplemented; + +__put_user (*v, t_int); +break ; + } +case IP_RECVERR : + { +struct errhdr_t { +struct sock_extended_err ee; +struct sockaddr_in offender; + }; +struct errhdr_t *errh = (struct errhdr_t *)data; +struct errhdr_t *target_errh = + (struct errhdr_t *)target_data; + +__put_user (errh->ee.ee_errno, &target_errh->ee.ee_errno); +__put_user (errh->ee.ee_origin, &target_errh->ee.ee_origin); +__put_user (errh->ee.ee_type, &target_errh->ee.ee_type); +__put_user (errh->ee.ee_code, &target_errh->ee.ee_code); +__put_user (errh->ee.ee_pad, &target_errh->ee.ee_pad); +__put_user (errh->ee.ee_info, &target_errh->ee.ee_info); +__put_user (errh->ee.ee_data, &target_errh->ee.ee_data); +host_to_target_sockaddr ((unsigned long ) &target_errh->offender, + (void *) &errh->offender,sizeof (errh->offender)); +break ; + } +default : + goto unimplemented; + } +break ; + +case SOL_IPV6 : +switch (cmsg->cmsg_type) { +case IPV6_HOPLIMIT : + { +uint32_t *v = (uint32_t *)data; +uint32_t *t_int = (uint32_t *)target_data; +if (tgt_len !=CMSG_LEN (0 )) + goto unimplemented; + +__put_user (*v, t_int); +break ; + } +case IPV6_RECVERR : + { +struct errhdr6_t { +struct sock_extended_err ee; +struct sockaddr_in6 offender; + }; +struct errhdr6_t *errh = (struct errhdr6_t *)data; +struct errhdr6_t *target_errh = + (struct errhdr6_t *)target_data; + +__put_user (errh->ee.ee_errno, &target_errh->ee.ee_errno); +__put_user (errh->ee.ee_origin, &target_errh->ee.ee_origin); +__put_user (errh->ee.ee_type, &target_errh->ee.ee_type); +__put_user (errh->ee.ee_code, &target_errh->ee.ee_code); +__put_user (errh->ee.ee_pad, &target_errh->ee.ee_pad); +__put_user (errh->ee.ee_info, &target_errh->ee.ee_info); +__put_user (errh->ee.ee_data, &target_errh->ee.ee_data); +host_to_target_sockaddr_in6 ((unsigned long ) &target_errh->offender, + &errh->offender,sizeof (errh->offender)); +break ; + } +default : + goto unimplemented; + } +break ; +default : unimplemented: gemu_log("Unsupported ancillary data: %d/%d\n",
@@ -2768,6 +2873,7 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case IP_PKTINFO :case IP_MTU_DISCOVER :case IP_RECVERR : +case IP_RECVTTL :case IP_RECVTOS :#ifdef IP_FREEBIND case IP_FREEBIND :
@@ -2817,6 +2923,11 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case IPV6_MTU :case IPV6_V6ONLY :case IPV6_RECVPKTINFO : +case IPV6_UNICAST_HOPS : +case IPV6_RECVERR : +case IPV6_RECVHOPLIMIT : +case IPV6_2292HOPLIMIT : +case IPV6_CHECKSUM : val =0 ;if (optlen <sizeof (uint32_t )) {return -TARGET_EINVAL ;
@@ -2827,6 +2938,50 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, ret =get_errno (setsockopt (sockfd, level, optname, &val,sizeof (val)));break ; +case IPV6_PKTINFO : + { +struct in6_pktinfo pki; + +if (optlen <sizeof (pki)) { +return -TARGET_EINVAL ; + } + +if (copy_from_user (&pki, optval_addr,sizeof (pki))) { +return -TARGET_EFAULT ; + } + + pki.ipi6_ifindex =tswap32 (pki.ipi6_ifindex); + + ret =get_errno (setsockopt (sockfd, level, optname, + &pki,sizeof (pki))); +break ; + } +default : + goto unimplemented; + } +break ; +case SOL_ICMPV6 : +switch (optname) { +case ICMPV6_FILTER : + { +struct icmp6_filter icmp6f; + +if (optlen <sizeof (icmp6f)) { +return -TARGET_EINVAL ; + } + +if (copy_from_user (&icmp6f, optval_addr,sizeof (icmp6f))) { +return -TARGET_EFAULT ; + } + +for (val =0 ; val <8 ; val++) { + icmp6f.data[val] =tswap32 (icmp6f.data[val]); + } + + ret =get_errno (setsockopt (sockfd, level, optname, + &icmp6f,sizeof (icmp6f))); +break ; + }default : goto unimplemented; }
@@ -2834,7 +2989,8 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,case SOL_RAW :switch (optname) {case ICMP_FILTER : -/* struct icmp_filter takes an u32 value */ +case IPV6_CHECKSUM : +/* those take an u32 value */ if (optlen <sizeof (uint32_t )) {return -TARGET_EINVAL ; }
linux-user/syscall_defs.h +8 -0
@@ -164,6 +164,14 @@ struct target_sockaddr_in { sizeof(struct target_in_addr)]; }; +struct target_sockaddr_in6 { +uint16_t sin6_family; +uint16_t sin6_port;/* big endian */ +uint32_t sin6_flowinfo;/* big endian */ +struct in6_addr sin6_addr;/* IPv6 address, big endian */ +uint32_t sin6_scope_id; +}; +struct target_sock_filter {abi_ushort code;uint8_t jt;
This series seems to have some coding style problems. See output below for more information:
Hi,
This series seems to have some coding style problems. See output below for more information:
Type: series
Subject: [Qemu-devel] [PATCH v3] linux-user: Add sockopts for IPv6 ping and IPv6 traceroute
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0
# Useful git options
git config --local diff.renamelimit 0
git config --local diff.renames True
commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do
echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
failed=1
echo
fi
n=$((n+1))done
exit $failed
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/[email protected] -> patchew/[email protected]
* [new tag] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'
ce6f142 linux-user: Add sockopts for IPv6 ping and IPv6 traceroute
=== OUTPUT BEGIN ===
Checking PATCH 1/1: linux-user: Add sockopts for IPv6 ping and IPv6 traceroute...
ERROR: braces {} are necessary for all arms of this statement
#54: FILE: linux-user/syscall.c:1656:
+ if (!target_saddr)
[...]
ERROR: braces {} are necessary for all arms of this statement #83: FILE: linux-user/syscall.c:1877:
+ if (tgt_len != CMSG_LEN(0))
[...]
ERROR: code indent should never use tabs
#108: FILE: linux-user/syscall.c:1902:
+^I^Ibreak;$
ERROR: braces {} are necessary for all arms of this statement #121: FILE: linux-user/syscall.c:1915:
+ if (tgt_len != CMSG_LEN(0))
[...]
ERROR: code indent should never use tabs
#125: FILE: linux-user/syscall.c:1919:
+^I^Ibreak;$
WARNING: line over 80 characters
#144: FILE: linux-user/syscall.c:1938:
+ host_to_target_sockaddr_in6((unsigned long) &target_errh->offender,
ERROR: code indent should never use tabs
#146: FILE: linux-user/syscall.c:1940:
+^I^Ibreak;$
ERROR: space required before the open parenthesis '(' #203: FILE: linux-user/syscall.c:2964:
+ switch(optname) {
total: 7 errors, 1 warnings, 214 lines checked
Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]