[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/11] linux-user: Add setsockopt(SO_ATTACH_FILTER)
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PATCH 04/11] linux-user: Add setsockopt(SO_ATTACH_FILTER) |
Date: |
Fri, 27 Sep 2013 15:09:59 +0300 |
From: Laurent Vivier <address@hidden>
This is needed to be able to run dhclient.
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/syscall.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
linux-user/syscall_defs.h | 12 ++++++++++++
2 files changed, 56 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 251c116..505031b 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -106,6 +106,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
#include <linux/dm-ioctl.h>
#include <linux/reboot.h>
#include <linux/route.h>
+#include <linux/filter.h>
#include "linux_loop.h"
#include "cpu-uname.h"
@@ -1357,6 +1358,49 @@ set_timeout:
case TARGET_SO_SNDTIMEO:
optname = SO_SNDTIMEO;
goto set_timeout;
+ case TARGET_SO_ATTACH_FILTER:
+ {
+ struct target_sock_fprog *tfprog;
+ struct target_sock_filter *tfilter;
+ struct sock_fprog fprog;
+ struct sock_filter *filter;
+ int i;
+
+ if (optlen != sizeof(*tfprog)) {
+ return -TARGET_EINVAL;
+ }
+ if (!lock_user_struct(VERIFY_READ, tfprog, optval_addr, 0)) {
+ return -TARGET_EFAULT;
+ }
+ if (!lock_user_struct(VERIFY_READ, tfilter,
+ tswapal(tfprog->filter), 0)) {
+ unlock_user_struct(tfprog, optval_addr, 1);
+ return -TARGET_EFAULT;
+ }
+
+ fprog.len = tswap16(tfprog->len);
+ filter = malloc(fprog.len * sizeof(*filter));
+ if (filter == NULL) {
+ unlock_user_struct(tfilter, tfprog->filter, 1);
+ unlock_user_struct(tfprog, optval_addr, 1);
+ return -TARGET_ENOMEM;
+ }
+ for (i = 0; i < fprog.len; i++) {
+ filter[i].code = tswap16(tfilter[i].code);
+ filter[i].jt = tfilter[i].jt;
+ filter[i].jf = tfilter[i].jf;
+ filter[i].k = tswap32(tfilter[i].k);
+ }
+ fprog.filter = filter;
+
+ ret = get_errno(setsockopt(sockfd, SOL_SOCKET,
+ SO_ATTACH_FILTER, &fprog, sizeof(fprog)));
+ free(filter);
+
+ unlock_user_struct(tfilter, tfprog->filter, 1);
+ unlock_user_struct(tfprog, optval_addr, 1);
+ return ret;
+ }
/* Options with 'int' argument. */
case TARGET_SO_DEBUG:
optname = SO_DEBUG;
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 2ebe356..5f53a28 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -119,6 +119,18 @@ struct target_sockaddr {
uint8_t sa_data[14];
};
+struct target_sock_filter {
+ abi_ushort code;
+ uint8_t jt;
+ uint8_t jf;
+ abi_uint k;
+};
+
+struct target_sock_fprog {
+ abi_ushort len;
+ abi_ulong filter;
+};
+
struct target_in_addr {
uint32_t s_addr; /* big endian */
};
--
1.8.1.2
- [Qemu-devel] [PULL] [PATCH 00/11] Linux-user updates, riku . voipio, 2013/09/27
- [Qemu-devel] [PATCH 01/11] alpha-linux-user: Fix umount syscall numbers, riku . voipio, 2013/09/27
- [Qemu-devel] [PATCH 03/11] linux-user: convert /proc/net/route when endianess differs, riku . voipio, 2013/09/27
- [Qemu-devel] [PATCH 05/11] linux-user: allow use of TIOCGSID, riku . voipio, 2013/09/27
- [Qemu-devel] [PATCH 02/11] mips-linux-user: Adjust names in mips_syscall_args, riku . voipio, 2013/09/27
- [Qemu-devel] [PATCH 04/11] linux-user: Add setsockopt(SO_ATTACH_FILTER),
riku . voipio <=
- [Qemu-devel] [PATCH 08/11] linux-user: correct how SOL_SOCKET is converted from target to host and back, riku . voipio, 2013/09/27
- [Qemu-devel] [PATCH 09/11] linux-user: Check type of microMIPS break instruction, riku . voipio, 2013/09/27
- [Qemu-devel] [PATCH 10/11] [v2] linux-user: implement m68k atomic syscalls, riku . voipio, 2013/09/27
- [Qemu-devel] [PATCH 07/11] linux-user: add support of binfmt_misc 'O' flag, riku . voipio, 2013/09/27
- [Qemu-devel] [PATCH 11/11] linux-user: Handle SOCK_CLOEXEC/NONBLOCK if unavailable on host, riku . voipio, 2013/09/27
- [Qemu-devel] [PATCH 06/11] linux-user: add some IPV6 commands in setsockop(), riku . voipio, 2013/09/27
- Re: [Qemu-devel] [PULL] [PATCH 00/11] Linux-user updates, Edgar E. Iglesias, 2013/09/27