[Qemu-devel] [PATCH 1/2 v2] qemu-user: Impl. setsockopt(SO_BINDTODEVICE)

[Qemu-devel] [PATCH 1/2 v2] qemu-user: Impl. setsockopt(SO_BINDTODEVICE)

[Joakim Tjernlund]

---
 linux-user/syscall.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 57c1664..5a07d9c 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1497,6 +1497,25 @@ set_timeout:
                 unlock_user_struct(tfprog, optval_addr, 1);
                 return ret;
         }
+	case TARGET_SO_BINDTODEVICE:
+	{
+		char *dev_ifname, *addr_ifname;
+
+		dev_ifname = lock_user(VERIFY_READ, optval_addr, optlen, 1);
+		if (!dev_ifname) {
+			return -TARGET_EFAULT;
+		}
+		if (optlen > IFNAMSIZ - 1) {
+			optlen = IFNAMSIZ - 1;
+		}
+		optname = SO_BINDTODEVICE;
+		addr_ifname = alloca(IFNAMSIZ);
+		memcpy(addr_ifname, dev_ifname, IFNAMSIZ);
+		addr_ifname[IFNAMSIZ - 1] = 0;
+		ret = get_errno(setsockopt(sockfd, level, optname, addr_ifname, optlen));
+		unlock_user (dev_ifname, optval_addr, 0);
+		return ret;
+	}
             /* Options with 'int' argument.  */
         case TARGET_SO_DEBUG:
 		optname = SO_DEBUG;
-- 
1.8.5.5

[Qemu-devel] [PATCH 2/2 v2] linux-user: impl. sockaddr_ll

[Joakim Tjernlund]

Used by AF_PACKET sockets
---
 linux-user/syscall.c      |  7 +++++++
 linux-user/syscall_defs.h | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5a07d9c..a87fe74 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1140,6 +1140,13 @@ static inline abi_long target_to_host_sockaddr(struct sockaddr *addr,
 
     memcpy(addr, target_saddr, len);
     addr->sa_family = sa_family;
+    if (sa_family == AF_PACKET) {
+	    struct target_sockaddr_ll *lladdr;
+
+	    lladdr = (struct target_sockaddr_ll *)addr;
+	    lladdr->sll_ifindex = tswap32(lladdr->sll_ifindex);
+	    lladdr->sll_hatype = tswap16(lladdr->sll_hatype);
+    }
     unlock_user(target_saddr, target_addr, 0);
 
     return 0;
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 8563027..329c9c5 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -121,6 +121,16 @@ struct target_sockaddr {
     uint8_t sa_data[14];
 };
 
+struct target_sockaddr_ll {
+	uint16_t sll_family;   /* Always AF_PACKET */
+	uint16_t sll_protocol; /* Physical layer protocol */
+	int      sll_ifindex;  /* Interface number */
+	uint16_t sll_hatype;   /* ARP hardware type */
+	uint8_t  sll_pkttype;  /* Packet type */
+	uint8_t  sll_halen;    /* Length of address */
+	uint8_t  sll_addr[8];  /* Physical layer address */
+};
+
 struct target_sock_filter {
     abi_ushort code;
     uint8_t jt;
-- 
1.8.5.5

Re: [Qemu-devel] [PATCH 1/2 v2] qemu-user: Impl. setsockopt(SO_BINDTODEVICE)

[Peter Maydell]

On 12 July 2014 10:46, Joakim Tjernlund <Joakim.Tjernlund@transmode.se> wrote:
> ---
>  linux-user/syscall.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 57c1664..5a07d9c 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -1497,6 +1497,25 @@ set_timeout:
>                  unlock_user_struct(tfprog, optval_addr, 1);
>                  return ret;
>          }
> +       case TARGET_SO_BINDTODEVICE:
> +       {
> +               char *dev_ifname, *addr_ifname;
> +
> +               dev_ifname = lock_user(VERIFY_READ, optval_addr, optlen, 1);
> +               if (!dev_ifname) {
> +                       return -TARGET_EFAULT;
> +               }
> +               if (optlen > IFNAMSIZ - 1) {
> +                       optlen = IFNAMSIZ - 1;
> +               }

This needs to go before the lock_user, not after.

> +               optname = SO_BINDTODEVICE;
> +               addr_ifname = alloca(IFNAMSIZ);
> +               memcpy(addr_ifname, dev_ifname, IFNAMSIZ);

You can't memcpy IFNAMSIZ bytes here because your source
might be shorter than that. memcpy() optlen bytes and set
addr_ifname[optlen] to 0.

> +               addr_ifname[IFNAMSIZ - 1] = 0;
> +               ret = get_errno(setsockopt(sockfd, level, optname, addr_ifname, optlen));
> +               unlock_user (dev_ifname, optval_addr, 0);
> +               return ret;
> +       }
>              /* Options with 'int' argument.  */
>          case TARGET_SO_DEBUG:
>                 optname = SO_DEBUG;
> --
> 1.8.5.5

Otherwise looks good; thanks.

thanks
-- PMM

Re: [Qemu-devel] [PATCH 2/2 v2] linux-user: impl. sockaddr_ll

[Peter Maydell]

On 12 July 2014 10:46, Joakim Tjernlund <Joakim.Tjernlund@transmode.se> wrote:
> Used by AF_PACKET sockets
> ---
>  linux-user/syscall.c      |  7 +++++++
>  linux-user/syscall_defs.h | 10 ++++++++++
>  2 files changed, 17 insertions(+)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 5a07d9c..a87fe74 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -1140,6 +1140,13 @@ static inline abi_long target_to_host_sockaddr(struct sockaddr *addr,
>
>      memcpy(addr, target_saddr, len);
>      addr->sa_family = sa_family;
> +    if (sa_family == AF_PACKET) {
> +           struct target_sockaddr_ll *lladdr;
> +
> +           lladdr = (struct target_sockaddr_ll *)addr;
> +           lladdr->sll_ifindex = tswap32(lladdr->sll_ifindex);
> +           lladdr->sll_hatype = tswap16(lladdr->sll_hatype);
> +    }
>      unlock_user(target_saddr, target_addr, 0);

Your indentation here and in the struct definition below
looks wrong -- should be four-spaces. Otherwise

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

PS: your commit message is a little terse. I would suggest:

===
linux-user: handle AF_PACKET sockaddrs in target_to_host_sockaddr

Implement conversion of the AF_PACKET sockaddr subtype
in target_to_host_sockaddr.
===

thanks
-- PMM