From patchwork Tue Oct 22 08:10:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11203949 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 520C4139A for ; Tue, 22 Oct 2019 08:16:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3276C20684 for ; Tue, 22 Oct 2019 08:16:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3276C20684 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMpLR-0000BB-6I for patchwork-qemu-devel@patchwork.kernel.org; Tue, 22 Oct 2019 04:16:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44159) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMpGG-0002hD-Mp for qemu-devel@nongnu.org; Tue, 22 Oct 2019 04:11:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMpGF-00054N-Ej for qemu-devel@nongnu.org; Tue, 22 Oct 2019 04:11:24 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:40997) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMpGF-00053W-4t for qemu-devel@nongnu.org; Tue, 22 Oct 2019 04:11:23 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MybX9-1i6Vha17qn-00yzDT; Tue, 22 Oct 2019 10:11:19 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 06/11] linux-user/syscall: Introduce target_sockaddr_nl Date: Tue, 22 Oct 2019 10:10:59 +0200 Message-Id: <20191022081104.11814-7-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022081104.11814-1-laurent@vivier.eu> References: <20191022081104.11814-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:cZCZNjFSvn6JZ5+AViajwJTnhlc+xH1cJl92ap2WOuFI7HJd+YP Ny3c/DvDRX+jV3hDnIrmkfmcWzELybH/cReND6lqryMrKTGlJm+/9Zos3vrPoskOw3Uf7iH Rv+COdgOMLK9Zpik1u1p2PuVYVl+APBSnf9Hw7aaUM+gQ6RvoJlyem21ueqX1u4ZFKTDVO/ DB7Z8HO6F4+w2rXY3NTPw== X-UI-Out-Filterresults: notjunk:1;V03:K0:6Qn5bnVgGAc=:mCL7xW8618kbGqJ7gorYNI FSa8MHPlQbeSQjROQIG8pd9qchPFBksyCxhMhs4kkpx/6vcg+l6mEYy88yM/SgyxMPm7E954S HOdxOXCHSPmPuGo9knTE9EL2s3UEBahi9mOX+dgCQ3HoBa5lMqto82x6Fx3oRBYRh16xlSwWP y29aIgv3L2Qlz8nWM9DJftvWGojS6qIQF9AS6wQm+WKlLEUNedpIv1n1GtuFc2bL7TLeii/Oe vwrT8S9Zn1PLRBSYpf/JwYzrZ7TDCxmc9c8qpKMQg5jARDc42kVW90oFustde+zuUSvVG1lJ+ FbL1d+W7dVyr6NMjj60/ZS8ZNrSPe9h/NeIQuy8/XQ/vZUugc0iF1BDcsB0aDv6VierBr4e8J LbLzapXdkUHD4j7QSxflCdVhBOFOP5mGp1bUwDcLRR7aqOmD8NFPxjPGvQTicuCRAJu/Iy26T 3gKcgC892VQ+t9J8vXmuo4dMrOFLEiFQv8vU35vz0WtmvohbFbUIi3oDB4FJdmHW2j3vh3jmK FNF0pS6y0HKBddP8bK9luL2igFAVX+gpOU0gIeFbI1EdRvA1yR2CPC8+g3/zkiX0AiGRT2nRX WclTBXH7RlZXwieSx4+XVRsFuDKoqNXv46kqf4fL0jn0gatnJtn2x8CWAiTBAPgyDgzbp4eUL tvELaWmxyHXmhySphON5RLW7TvsCpbhvRTaecPN1xx88joLXLMG3rsQU1ctj4HC9bZsE6C4k7 CA1ietTDyhOe9xhvs9aaSMgt+L8z0sC5XtYHnR2YWasl/phkzQFQyNLs3NHA1PqfbG5puDoOR Qbf0zpyy8SAVVKEVtnSkQaZCXXQCNEhZnd8/O1h5wTuT7SLq5Y8rgvOEfR540utX8hel8z/YY lMQ2IV4wHOR6bfwCbNzlN5pbGuXDPdlc5c4l0togU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Guido_G=C3=BCnther?= , Riku Voipio , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Tested-By: Guido Günther Reviewed-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20191021114857.20538-5-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 6 ++++-- linux-user/syscall_defs.h | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e2af3c1494fa..f1ab81b91771 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1496,8 +1496,10 @@ static inline abi_long host_to_target_sockaddr(abi_ulong target_addr, sizeof(target_saddr->sa_family)) { target_saddr->sa_family = tswap16(addr->sa_family); } - if (addr->sa_family == AF_NETLINK && len >= sizeof(struct sockaddr_nl)) { - struct sockaddr_nl *target_nl = (struct sockaddr_nl *)target_saddr; + if (addr->sa_family == AF_NETLINK && + len >= sizeof(struct target_sockaddr_nl)) { + struct target_sockaddr_nl *target_nl = + (struct target_sockaddr_nl *)target_saddr; target_nl->nl_pid = tswap32(target_nl->nl_pid); target_nl->nl_groups = tswap32(target_nl->nl_groups); } else if (addr->sa_family == AF_PACKET) { diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index fa69c6ab8d01..7694d72446d1 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -153,6 +153,13 @@ struct target_sockaddr_un { uint8_t sun_path[108]; }; +struct target_sockaddr_nl { + abi_ushort nl_family; /* AF_NETLINK */ + abi_ushort __pad; + abi_uint nl_pid; + abi_uint nl_groups; +}; + struct target_in_addr { uint32_t s_addr; /* big endian */ };