From nobody Fri May 3 03:11:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1557739344; cv=none; d=zoho.com; s=zohoarc; b=ayI3js/mQV3cslXdPakD2uAejbUHxtUohF5sSqRveiN0fwQ9wvhn1CPSxgygbMUsz7U0PA1pNyYumthFezO5eP0YKDL6cgjt0+OZJDrdkeTR4NXxPVHkDtSYyoVT2Nx+UuplvVH8rI7S57WJzyS7S+BxpbFYckbJIrUTx5aU6jc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557739344; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=sSv0wM0GqMhLQkeerhuYVJ5CILu7deO+rCGJEaWQs1c=; b=KTPRefFE+wj1ElXY5uZWWvjLi/x4kB//i0hZwte8lIa0nNEW6zRAZ0ih/yNzAS2rs8dIpGPxrsMBNWJtRwSWQAGSrDRvGfxvpiBttZ62zB4MVcTMFzwRe5dj2esnTol+5jBJlbIcLRZohBBpHbanLi2x5MQpsGK4xztNJ4LDJHI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557739344371476.3324778099802; Mon, 13 May 2019 02:22:24 -0700 (PDT) Received: from localhost ([127.0.0.1]:53885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQ7A1-0002Uz-AI for importer@patchew.org; Mon, 13 May 2019 05:22:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQ78d-0001Vs-F8 for qemu-devel@nongnu.org; Mon, 13 May 2019 05:20:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQ6uh-0000zx-L4 for qemu-devel@nongnu.org; Mon, 13 May 2019 05:06:28 -0400 Received: from mx2.suse.de ([195.135.220.15]:39380 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQ6uh-0000zS-F9 for qemu-devel@nongnu.org; Mon, 13 May 2019 05:06:27 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 93A07AECD; Mon, 13 May 2019 09:06:26 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Andreas Schwab To: qemu-devel@nongnu.org X-Yow: Edwin Meese made me wear CORDOVANS!! Date: Mon, 13 May 2019 11:06:26 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Subject: [Qemu-devel] [PATCH] linux-user: implement getsockopt SO_RCVTIMEO and SO_SNDTIMEO X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Andreas Schwab Reviewed-by: Laurent Vivier --- linux-user/syscall.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index d113a65831..ba5775a94e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2171,10 +2171,42 @@ static abi_long do_getsockopt(int sockfd, int level= , int optname, level =3D SOL_SOCKET; switch (optname) { /* These don't just return a single integer */ - case TARGET_SO_RCVTIMEO: - case TARGET_SO_SNDTIMEO: case TARGET_SO_PEERNAME: goto unimplemented; + case TARGET_SO_RCVTIMEO: { + struct timeval tv; + socklen_t tvlen; + + optname =3D SO_RCVTIMEO; + +get_timeout: + if (get_user_u32(len, optlen)) { + return -TARGET_EFAULT; + } + if (len < 0) { + return -TARGET_EINVAL; + } + + tvlen =3D sizeof(tv); + ret =3D get_errno(getsockopt(sockfd, level, optname, + &tv, &tvlen)); + if (ret < 0) { + return ret; + } + if (len > sizeof(struct target_timeval)) { + len =3D sizeof(struct target_timeval); + } + if (copy_to_user_timeval(optval_addr, &tv)) { + return -TARGET_EFAULT; + } + if (put_user_u32(len, optlen)) { + return -TARGET_EFAULT; + } + break; + } + case TARGET_SO_SNDTIMEO: + optname =3D SO_SNDTIMEO; + goto get_timeout; case TARGET_SO_PEERCRED: { struct ucred cr; socklen_t crlen; --=20 2.21.0 --=20 Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint =3D 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."