diff mbox

linux-user: Implement setsockopt SOL_SOCKET/SO_LINGER

Message ID mvmtvuvk6kf.fsf@suse.de (mailing list archive)
State New, archived
Headers show

Commit Message

Andreas Schwab Feb. 5, 2018, 11:40 a.m. UTC 
Signed-off-by: Andreas Schwab <schwab@suse.de>
---
 linux-user/syscall.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

Comments

Laurent Vivier Feb. 15, 2018, 2:04 p.m. UTC | #1 
Le 05/02/2018 à 12:40, Andreas Schwab a écrit :
> Signed-off-by: Andreas Schwab <schwab@suse.de>
> ---
>  linux-user/syscall.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index ff89016adc..82848fd97d 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -3130,6 +3130,29 @@ set_timeout:
>  		unlock_user (dev_ifname, optval_addr, 0);
>  		return ret;
>  	}
> +        case TARGET_SO_LINGER:
> +        {
> +                struct linger {
> +                    int l_onoff;
> +                    int l_linger;
> +                } linger;
> +
> +                optname = SO_LINGER;
> +
> +                if (optlen != sizeof(linger)) {
> +                    return -TARGET_EINVAL;
> +                }
> +                if (copy_from_user(&linger, optval_addr, optlen)) {
> +                    return -TARGET_EFAULT;
> +                }
> +
> +                linger.l_onoff = tswap32(linger.l_onoff);
> +                linger.l_linger = tswap32(linger.l_linger);
> +
> +                ret = get_errno(setsockopt(sockfd, SOL_SOCKET, optname,
> +                                           &linger, sizeof(linger)));
> +                return ret;
> +        }
>              /* Options with 'int' argument.  */
>          case TARGET_SO_DEBUG:
>  		optname = SO_DEBUG;
> 

I think this series gives a more complete solution to the problem:

https://patchwork.ozlabs.org/project/qemu-devel/list/?series=3985
  [1/3] linux-user: fix TARGET_SO_LINGER for sparc
  [2/3] linux-user: add SO_LINGER to setsockopt
  [3/3] linux-user: add SO_LINGER to getsockopt

but it needs some updates.

Thanks,
Laurent
diff mbox

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ff89016adc..82848fd97d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3130,6 +3130,29 @@  set_timeout:
 		unlock_user (dev_ifname, optval_addr, 0);
 		return ret;
 	}
+        case TARGET_SO_LINGER:
+        {
+                struct linger {
+                    int l_onoff;
+                    int l_linger;
+                } linger;
+
+                optname = SO_LINGER;
+
+                if (optlen != sizeof(linger)) {
+                    return -TARGET_EINVAL;
+                }
+                if (copy_from_user(&linger, optval_addr, optlen)) {
+                    return -TARGET_EFAULT;
+                }
+
+                linger.l_onoff = tswap32(linger.l_onoff);
+                linger.l_linger = tswap32(linger.l_linger);
+
+                ret = get_errno(setsockopt(sockfd, SOL_SOCKET, optname,
+                                           &linger, sizeof(linger)));
+                return ret;
+        }
             /* Options with 'int' argument.  */
         case TARGET_SO_DEBUG:
 		optname = SO_DEBUG;