linux-user: return EINVAL on incorrect sockaddr
PATCH 1/1 linux-user: return EINVAL on incorrect sockaddr
From: Lauro Ramos Venancio <[email protected]>
Fixes ltp test accept01
Signed-off-by Riku Voipio <[email protected]>
--- linux-user/syscall.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-)
linux-user/syscall.c +31 -2
@@ -1185,11 +1185,19 @@ static abi_long do_socket(int domain, int type, int protocol)return get_errno (socket (domain, type, protocol)); } +/* MAX_SOCK_ADDR from linux/net/socket.c */ +#define MAX_SOCK_ADDR 128 +/* do_bind() Must return target values and target errnos. */ static abi_long do_bind (int sockfd,abi_ulong target_addr,socklen_t addrlen) { -void *addr =alloca (addrlen); +void *addr; + +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + + addr =alloca (addrlen);target_to_host_sockaddr (addr, target_addr, addrlen);return get_errno (bind (sockfd, addr, addrlen));
@@ -1199,7 +1207,12 @@ static abi_long do_bind(int sockfd, abi_ulong target_addr,static abi_long do_connect (int sockfd,abi_ulong target_addr,socklen_t addrlen) { -void *addr =alloca (addrlen); +void *addr; + +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + + addr =alloca (addrlen);target_to_host_sockaddr (addr, target_addr, addrlen);return get_errno (connect (sockfd, addr, addrlen));
@@ -1271,6 +1284,9 @@ static abi_long do_accept(int fd, abi_ulong target_addr,if (get_user_u32 (addrlen, target_addrlen_addr))return -TARGET_EFAULT ; +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + addr =alloca (addrlen); ret =get_errno (accept (fd, addr, &addrlen));
@@ -1293,6 +1309,9 @@ static abi_long do_getpeername(int fd, abi_ulong target_addr,if (get_user_u32 (addrlen, target_addrlen_addr))return -TARGET_EFAULT ; +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + addr =alloca (addrlen); ret =get_errno (getpeername (fd, addr, &addrlen));
@@ -1315,6 +1334,9 @@ static abi_long do_getsockname(int fd, abi_ulong target_addr,if (get_user_u32 (addrlen, target_addrlen_addr))return -TARGET_EFAULT ; +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + addr =alloca (addrlen); ret =get_errno (getsockname (fd, addr, &addrlen));
@@ -1350,6 +1372,9 @@ static abi_long do_sendto(int fd, abi_ulong msg, size_t len, int flags,void *host_msg;abi_long ret; +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + host_msg =lock_user (VERIFY_READ , msg, len,1 );if (!host_msg)return -TARGET_EFAULT ;
@@ -1382,6 +1407,10 @@ static abi_long do_recvfrom(int fd, abi_ulong msg, size_t len, int flags, ret = -TARGET_EFAULT ; goto fail; } +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) { + ret = -TARGET_EINVAL ; + goto fail; + } addr =alloca (addrlen); ret =get_errno (recvfrom (fd, host_msg, len, flags, addr, &addrlen)); }else {
Signature · 5 lines
1.5.6.5 -- "rm -rf" only sounds scary if you don't have backups
Aurelien Jarno
AppliedQuoted 5 lines · Riku Voipio
From: Lauro Ramos Venancio <[email protected]>
Fixes ltp test accept01
Signed-off-by Riku Voipio <[email protected]>
Thanks, applied.
Quoted 103 lines
--- linux-user/syscall.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-)linux-user/syscall.c +31
-2@@ -1185,11 +1185,19 @@ static abi_long do_socket(int domain, int type, int protocol)return get_errno (socket (domain, type, protocol)); } +/* MAX_SOCK_ADDR from linux/net/socket.c */ +#define MAX_SOCK_ADDR 128 +/* do_bind() Must return target values and target errnos. */ static abi_long do_bind (int sockfd,abi_ulong target_addr,socklen_t addrlen) { -void *addr =alloca (addrlen); +void *addr; + +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + + addr =alloca (addrlen);target_to_host_sockaddr (addr, target_addr, addrlen);return get_errno (bind (sockfd, addr, addrlen));@@ -1199,7 +1207,12 @@ static abi_long do_bind(int sockfd, abi_ulong target_addr,static abi_long do_connect (int sockfd,abi_ulong target_addr,socklen_t addrlen) { -void *addr =alloca (addrlen); +void *addr; + +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + + addr =alloca (addrlen);target_to_host_sockaddr (addr, target_addr, addrlen);return get_errno (connect (sockfd, addr, addrlen));@@ -1271,6 +1284,9 @@ static abi_long do_accept(int fd, abi_ulong target_addr,if (get_user_u32 (addrlen, target_addrlen_addr))return -TARGET_EFAULT ; +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + addr =alloca (addrlen); ret =get_errno (accept (fd, addr, &addrlen));@@ -1293,6 +1309,9 @@ static abi_long do_getpeername(int fd, abi_ulong target_addr,if (get_user_u32 (addrlen, target_addrlen_addr))return -TARGET_EFAULT ; +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + addr =alloca (addrlen); ret =get_errno (getpeername (fd, addr, &addrlen));@@ -1315,6 +1334,9 @@ static abi_long do_getsockname(int fd, abi_ulong target_addr,if (get_user_u32 (addrlen, target_addrlen_addr))return -TARGET_EFAULT ; +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + addr =alloca (addrlen); ret =get_errno (getsockname (fd, addr, &addrlen));@@ -1350,6 +1372,9 @@ static abi_long do_sendto(int fd, abi_ulong msg, size_t len, int flags,void *host_msg;abi_long ret; +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) +return -TARGET_EINVAL ; + host_msg =lock_user (VERIFY_READ , msg, len,1 );if (!host_msg)return -TARGET_EFAULT ;@@ -1382,6 +1407,10 @@ static abi_long do_recvfrom(int fd, abi_ulong msg, size_t len, int flags, ret = -TARGET_EFAULT ; goto fail; } +if (addrlen <0 || addrlen >MAX_SOCK_ADDR ) { + ret = -TARGET_EINVAL ; + goto fail; + } addr =alloca (addrlen); ret =get_errno (recvfrom (fd, host_msg, len, flags, addr, &addrlen)); }else {Signature · 5 lines
1.5.6.5 -- "rm -rf" only sounds scary if you don't have backups
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net