From nobody Mon Apr 29 00:29:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631013197; cv=none; d=zohomail.com; s=zohoarc; b=NW5XqOYeRS+NuE+Y6bGp+i3TKYpr8WFY+LezW+6lGWaD0vBvKUE5JoGR5bZqAt038eyWaeL9G+3E09+bb7lPC1RXnnp/4UP5clhjwr6pzLhFkjWyMU8nnNwaf0bWE8Y4hO7vqFJ9CRCA3wDK+Kes6ns9gbYRRbqrlM1zDUVF4ZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631013197; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=Is/Luwq1bm4CYoIG+CPIF8a0JGHwBGSHyAB59kNeOMM=; b=W0YxmvLZ/u7K6Y8H1gS71s1aLUKuMZI+6IWAKJ1U/vDBQtl1N35OB7Qv53+5NJFh3NeJnVMak3VrnIaz5/hVpM/dVWRHr5NnMox6dPw4fsgrCkvrYqpj6Cu5QjwcZFB1ytkO+zlfN/PtgHbeG1jxfitzPErdIPNz/XC+5DfNtW4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1631013197293553.6837387365102; Tue, 7 Sep 2021 04:13:17 -0700 (PDT) Received: by mail-wm1-f54.google.com with SMTP id v20-20020a1cf714000000b002e71f4d2026so1588188wmh.1 for ; Tue, 07 Sep 2021 04:13:16 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id z19sm2533029wma.0.2021.09.07.04.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 04:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Is/Luwq1bm4CYoIG+CPIF8a0JGHwBGSHyAB59kNeOMM=; b=ksSb7jUP6CdFVpfXMu+ahuOIGjkiRict74wzsLnyxUPaF1XamcFrwc1CORwrsqpmAb RJpsQL/Pm0wlZrtUVAk4APmGDAMXKhc6s44gIp60ST+ZAx79Fg7IdsSOijAlQJ+5awZ/ tAHV3JSpyYDs6jFkGpN3LzCM9F3jnaoTIZwR51kXpRfW0D1/ZIBN/Z3mKXzQNSp2J6o3 EGGt4e+6qxZQ0N1iFIuGz3BCgic0dgM/IKy97NsJKEU5pt4REFjQRFK+sAhH4FeTehAd Ub6T6GPycUEWE3tk88j+ILwqjvng65rEpr9DScLDQ+MavTqlxk4S8pr42DDso+idyKYR Pk4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=Is/Luwq1bm4CYoIG+CPIF8a0JGHwBGSHyAB59kNeOMM=; b=QN56BcSarjCJnC5FxiiFuJN/iUsos0eSamSk4NR2vYmbApF2dIom/tEY43G7d21QMk sWHow5+LX6JvT1Mi1uNuJsNl8ePdA5WVAXFlfyPLGmIdrwfY/oqFOppOj3stxPCGE1Rz bu4ATfJkRuO0rjzQY+auzTihSwgiKYAKcVrf8ObdhedMSPaoQo8LE9LszN35K9yw6ca+ y+kx/L1X0hn5g+1FaWjFTVjlfHWprgqy8ygAz5s2MDHfJMdnJai+Q3koYm621anMWUZg kRPejrHLhD900UspkQ9e0xyuMmIMcoj+xvK5xDqGBBbB1FPm+NICCKDNj8U4OYF8JT/2 TY3w== X-Gm-Message-State: AOAM532Q3kykPOs74IyI1zcSa+aarGZRS5JhdSvjbenWdLesGnlAFusP i5tDbfw7agMI6WWsXqf1ViM= X-Google-Smtp-Source: ABdhPJxrJgKVFdoROVpEgyAtIYNRmO6r2E67tqc0ozzvAfDKukCOiLpT/+lznaMkyUrNvG3a3sAnfQ== X-Received: by 2002:a7b:c389:: with SMTP id s9mr3420198wmj.129.1631013195538; Tue, 07 Sep 2021 04:13:15 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Helge Deller , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Conrad Meyer Subject: [PATCH] linux-user: Correct host errno for IP[V6]_RECVERR socket options Date: Tue, 7 Sep 2021 13:13:13 +0200 Message-Id: <20210907111313.1880866-1-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1631013198548100001 Target errno should be converted to host errno in IP_RECVERR and IPV6_RECVERR socket options. Fixes: ee1ac3a1822 ("linux-user: Add sockopts for IPv6") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/602 Reported-by: Conrad Meyer Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/syscall.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index ccd3892b2df..edc9d6b5ba2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1967,7 +1967,8 @@ static inline abi_long host_to_target_cmsg(struct tar= get_msghdr *target_msgh, tgt_len !=3D sizeof(struct errhdr_t)) { goto unimplemented; } - __put_user(errh->ee.ee_errno, &target_errh->ee.ee_errno); + __put_user(get_errno(errh->ee.ee_errno), + &target_errh->ee.ee_errno); __put_user(errh->ee.ee_origin, &target_errh->ee.ee_origin); __put_user(errh->ee.ee_type, &target_errh->ee.ee_type); __put_user(errh->ee.ee_code, &target_errh->ee.ee_code); @@ -2011,7 +2012,8 @@ static inline abi_long host_to_target_cmsg(struct tar= get_msghdr *target_msgh, tgt_len !=3D sizeof(struct errhdr6_t)) { goto unimplemented; } - __put_user(errh->ee.ee_errno, &target_errh->ee.ee_errno); + __put_user(get_errno(errh->ee.ee_errno), + &target_errh->ee.ee_errno); __put_user(errh->ee.ee_origin, &target_errh->ee.ee_origin); __put_user(errh->ee.ee_type, &target_errh->ee.ee_type); __put_user(errh->ee.ee_code, &target_errh->ee.ee_code); --=20 2.31.1