gwj / at91sam9263 · Commits

Commit 607175e0fb53f5f207fb9a1e8340566e616735aa

Authored by aurel32
1 parent 7d8cec95

linux-user: unix sockets - fix running dbus 

dbus sends too short (according to man 7 unix) addrlen for it's
unix socket. I've been told that happens with other applications
as well. Linux kernel doesn't appear to mind, so I guess
we whould be tolerant as well. Expand sockaddr with +1 to fit
the \0 of the pathname passed.

(scratchbox1 qemu had a very different workaround for the same issue).

Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7116 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 27 additions and 2 deletions
linux-user/syscall.c
  View file @607175e
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
44 #include <signal.h> 44 #include <signal.h>
45 #include <sched.h> 45 #include <sched.h>
46 #include <sys/socket.h> 46 #include <sys/socket.h>
  47 +#include <sys/un.h>
47 #include <sys/uio.h> 48 #include <sys/uio.h>
48 #include <sys/poll.h> 49 #include <sys/poll.h>
49 #include <sys/times.h> 50 #include <sys/times.h>
@@ -735,13 +736,37 @@ static inline abi_long target_to_host_sockaddr(struct sockaddr *addr, @@ -735,13 +736,37 @@ static inline abi_long target_to_host_sockaddr(struct sockaddr *addr,
735 abi_ulong target_addr, 736 abi_ulong target_addr,
736 socklen_t len) 737 socklen_t len)
737 { 738 {
  739 + const socklen_t unix_maxlen = sizeof (struct sockaddr_un);
  740 + sa_family_t sa_family;
738 struct target_sockaddr *target_saddr; 741 struct target_sockaddr *target_saddr;
739 742
740 target_saddr = lock_user(VERIFY_READ, target_addr, len, 1); 743 target_saddr = lock_user(VERIFY_READ, target_addr, len, 1);
741 if (!target_saddr) 744 if (!target_saddr)
742 return -TARGET_EFAULT; 745 return -TARGET_EFAULT;
  746 +
  747 + sa_family = tswap16(target_saddr->sa_family);
  748 +
  749 + /* Oops. The caller might send a incomplete sun_path; sun_path
  750 + * must be terminated by \0 (see the manual page), but
  751 + * unfortunately it is quite common to specify sockaddr_un
  752 + * length as "strlen(x->sun_path)" while it should be
  753 + * "strlen(...) + 1". We'll fix that here if needed.
  754 + * Linux kernel has a similar feature.
  755 + */
  756 +
  757 + if (sa_family == AF_UNIX) {
  758 + if (len < unix_maxlen && len > 0) {
  759 + char *cp = (char*)target_saddr;
  760 +
  761 + if ( cp[len-1] && !cp[len] )
  762 + len++;
  763 + }
  764 + if (len > unix_maxlen)
  765 + len = unix_maxlen;
  766 + }
  767 +
743 memcpy(addr, target_saddr, len); 768 memcpy(addr, target_saddr, len);
744 - addr->sa_family = tswap16(target_saddr->sa_family); 769 + addr->sa_family = sa_family;
745 unlock_user(target_saddr, target_addr, 0); 770 unlock_user(target_saddr, target_addr, 0);
746 771
747 return 0; 772 return 0;
@@ -1195,7 +1220,7 @@ static abi_long do_bind(int sockfd, abi_ulong target_addr, @@ -1195,7 +1220,7 @@ static abi_long do_bind(int sockfd, abi_ulong target_addr,
1195 if (addrlen < 0 || addrlen > MAX_SOCK_ADDR) 1220 if (addrlen < 0 || addrlen > MAX_SOCK_ADDR)
1196 return -TARGET_EINVAL; 1221 return -TARGET_EINVAL;
1197 1222
1198 - addr = alloca(addrlen); 1223 + addr = alloca(addrlen+1);
1199 1224
1200 target_to_host_sockaddr(addr, target_addr, addrlen); 1225 target_to_host_sockaddr(addr, target_addr, addrlen);
1201 return get_errno(bind(sockfd, addr, addrlen)); 1226 return get_errno(bind(sockfd, addr, addrlen));