From nobody Fri Jun 17 19:41:37 2022 X-Original-To: dev-commits-src-all@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 C323185DFB3; Fri, 17 Jun 2022 19:41:38 +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 4LPqDL12hNz3jBB; Fri, 17 Jun 2022 19:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494898; 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=W1/t/IRHTZpy7iowFBWpkdOqA6Pp/Mcqp2XyqiBQG+8=; b=v4KxGJ8YgQluXTbVxvsC53kEvudszxTvl/J1oi+52b2yUV3cwaZLnJDcyukHkSL7BdfkEq cE9zLI+/PXzRvtAtSnNtVyb0FNYcoi3bOiPZCekW0Qui3bw+pzazD4pTp1O+ZY1iFPFGkv 0QLv7kXf7485WSFGPCZq7Wb7Z8Z80bfrfstzId+ofk5IRYdYItOKY0V7B8/M/hM+rr8oXJ YuvHXj+JC2HkteYNfef1ePzKdKfd3/i+N7C9w0zMTlvrWmqQZmz6krPENjWDUTbBmUkpWI Dwg9ZGeovkE4nMxB5omo8g6jX1x9/fb1KQIGLmddLrSDUs6Q3HZq54pO3IcEpg== 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 9DEEE25E0C; Fri, 17 Jun 2022 19:41:37 +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 25HJfb2M031031; Fri, 17 Jun 2022 19:41:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJfbnJ031018; Fri, 17 Jun 2022 19:41:37 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:41:37 GMT Message-Id: <202206171941.25HJfbnJ031018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 8cbf694e6808 - stable/13 - linux(4): Return EINVAL when the clockid has invalid bits are set List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8cbf694e680835667db80f81a5d4103e5174de35 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494898; 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=W1/t/IRHTZpy7iowFBWpkdOqA6Pp/Mcqp2XyqiBQG+8=; b=Oxu57QkXSMpVOJUTqgvbc6TdBU2sJO3ZQx9HyJkiKix6tO6MB6pQ8ENasj5R2rP1k/VUrN X5mkqOGfp5bWgoRuKbopkrgowlwQVXG2tddNxj+c4QaQV6PUK5p2VAmjR5Rb++QmA1sSFv eC6oMy7xRTrEhFBqXsXqRB1Wl5bD1Yyt02Bd/m41xPyN/5mavdL4j7Hi8vu6jvW5CQDjaX ZkNck7q9+QreOFjYlS9rqC7NBG9nfCSihnel+frTWzDgwqJVXv0K/AG25AD2MLmvuWC+5G cE7XQYX4iq9VhTFs+V1ehwOwzxs/D8DjSFXwcSjePk8Ji9L9dU4j+UnUOwKq2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494898; a=rsa-sha256; cv=none; b=rkbo+53nDjeJnYo60KPJhfb5tatwJ9U5pwfnS34L3KDQ9vcbv5ErKiaSI/PLySvOym/3Be 3ZYB7JakDkdZ6vEGXBYTcdO2d6eyIcSkyAoAt2FsU+/7KD0uHkJT0fvYMduPxlw6pydaiQ Jn4REKKOoek+mlCbAiTFEj+opb6nS8WbrESH/9kdhv1Zv4EN0AImER2qkwMXKFwX3xX/GK rrkMhwN5bcmsXRy3qpPzRxe2K24HnKjg8EIpO1dBVqX2V6HOy9l2BBk4gobM0kC2zxn/gp gdq8vEoRbpclHbTNMe+0c42YBhjmCfxmtplxAvwV6lfQTSfipv5153duWG6gjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8cbf694e680835667db80f81a5d4103e5174de35 commit 8cbf694e680835667db80f81a5d4103e5174de35 Author: Dmitry Chagin AuthorDate: 2022-05-31 08:46:15 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:41 +0000 linux(4): Return EINVAL when the clockid has invalid bits are set Linux forbids PERTHREAD bit set for CLOCKFD clock. MFC after: 2 weeks (cherry picked from commit 539fadb493d34e6607f7492f018365bdc2abc23a) --- sys/compat/linux/linux_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index 5d2269190931..32db84a570b9 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -283,7 +283,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) unsupported_clockid, l); return (ENOTSUP); } - if (LINUX_CPUCLOCK_WHICH(l) >= LINUX_CPUCLOCK_MAX) + if ((l & LINUX_CLOCKFD_MASK) == LINUX_CLOCKFD_MASK) return (EINVAL); if (LINUX_CPUCLOCK_PERTHREAD(l))