From nobody Thu Feb 17 12:54:35 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3A8A019CA8E5; Thu, 17 Feb 2022 12:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jzvt35pKgz3FYH; Thu, 17 Feb 2022 12:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645102475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+SXdfcMDWaRWY08gnDLmNDeyo8WxkL5N9k9vC9oSh/c=; b=e0u1uQjsmf/spPD+2voO5hLGXquF7AcKbOPO+D6u/3JLDEDjT9NoTNWmd26Hlr8jUYEH0t xdiicxlOrL9S4aoK1dMQ7K/74nHomJmJWVhptFsUVZRmuFMVN3vdHTpLbRiCPNBjPgCC5w XZXX54lCVdzzPVuDGbgDSVgzsHEC9WTDCtYlT9GSUgckbzelA1m0IQXHjiy6wB/BucjPlL b9vN+5SXSs+O9t9iIXTci9ywPU4qR1t4HdONPCMYpTVIiVXVP2P5xcw39XWPSJnkd6rwaa zDuUjY7dwU00OixII5IyQ/5kVddDUklKpxcwLpoF1Cc2uC37nxfq/s/g0gxZcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C1F21EA3; Thu, 17 Feb 2022 12:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21HCsZ6G080380; Thu, 17 Feb 2022 12:54:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HCsZg6080379; Thu, 17 Feb 2022 12:54:35 GMT (envelope-from git) Date: Thu, 17 Feb 2022 12:54:35 GMT Message-Id: <202202171254.21HCsZg6080379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: ecfdca569820 - stable/13 - linux: Also translate the signal if the code is CLD_KILLED List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ecfdca569820c5b88a74442b6335212aa57009aa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645102475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+SXdfcMDWaRWY08gnDLmNDeyo8WxkL5N9k9vC9oSh/c=; b=BjnFUypnt9TA9xpQzwfhdbLnFj5534Vj7ilQRtV/TIfBd/4awbuYV5wF/2NQRg7MqXY2Xs O5GpkJZziWNBEFG1A8KU3qTKbOVzee5aeXFCyJWSj0vaJqmv7KREJr/Uu7bgE8Z6yJH3SE tsPF/8BGeL32oJYFhXN7EUWjQflt/XXj00cxO18KWkN5NUfAUa/b0vxQ3M04djBWmxxtxU gXeTqP9DaRigNn9zKQJfWRI4Dk0OklSsHUQWqXfYl55F+TSMlidtEw+ykGgUgwOPcfC3UJ DksU+bjG+EZd6KU+8RecA81dBo87IxCsc5BcDq9Ljr0gpiW8xrfxqEkH4G/sAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645102475; a=rsa-sha256; cv=none; b=gTHc8c7UghtEMVpn6rhL3TKDg5D+Fu/6qLM5ieuTtqAakinWjZYPuJ7Lm4NwDaZBxmXH8L wxx1ecSvNqhO+E0E/OW24r8+gHO9Tc42tr5nhNBA37cJw3t5hdPqQZTzBozcai+AJ77xWj U/AYGB5xRIO0kntFQ1x8nkvxvK/l1H9KViwqiUt1GBrO2OqW3ccekuYF5+GJlWKnx8WkJF tOFkrgLZRcFW3VbQndCyK5HtQkXBPVDBialfNCiEZYsqjGdabsgcwflgQ3i8bDQYjVDi5L txdxyZNZIMWP+BJJKDne7tHFKP1mbsLElR0UxKwWy3Aw0Ja1OLYhp9F3Mv2qAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=ecfdca569820c5b88a74442b6335212aa57009aa commit ecfdca569820c5b88a74442b6335212aa57009aa Author: Edward Tomasz Napierala AuthorDate: 2021-10-29 13:56:43 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-13 22:25:28 +0000 linux: Also translate the signal if the code is CLD_KILLED This fixes ./waitid.gen.test from the strace(1) test suite. Reviewed By: kib Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D32617 (cherry picked from commit c8c93b151678b57d86cd50509c9cbb863bbe9e57) --- sys/compat/linux/linux_signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 51f08d61bef1..71b00da569dc 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -635,7 +635,7 @@ siginfo_to_lsiginfo(const siginfo_t *si, l_siginfo_t *lsi, l_int sig) lsi->lsi_pid = si->si_pid; lsi->lsi_uid = si->si_uid; - if (si->si_code == CLD_STOPPED) + if (si->si_code == CLD_STOPPED || si->si_code == CLD_KILLED) lsi->lsi_status = bsd_to_linux_signal(si->si_status); else if (si->si_code == CLD_CONTINUED) lsi->lsi_status = bsd_to_linux_signal(SIGCONT);