From nobody Fri Jun 17 19:40:03 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 8936B85C9F5; Fri, 17 Jun 2022 19:40:05 +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 4LPqBX4xyvz3hGT; Fri, 17 Jun 2022 19:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494805; 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=+zgPuwbPz2neHPxtuUXVn3Tqxs8q5xzq8PZHSfFz6/g=; b=SGDWMD7ZsgcwAC1apea3wv+Gbi2lYdMLH3ZDzNriZS9E8Ir9OzU7Svl5Gn/9AIHRP9rFIN LiA5rYcpA4qjuYGzkuUAPv4S7au5XxeMuOOGST11Ia2vsQeyldwx6D/IhurxxQ7rjykGh5 UnitImeSUVQFjiqNTG7zRT7Aw4kuLclqRB3O+xz8YKVvP3kzZLw8ffS5Pxb6CPafx7RTIn BZPWW8zwoQEy5VbHulfmElNiWJ+gjgjTNQqUX7H3XrzNuWCuBJrocDhmkHapMQHoZL97Jn yk3+TNKEnMGoVl1yJ0n67BDzA4VR3lEArMM/VdbVg+vQDd2HEUCbsu9G1ZYn9w== 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 DCB3A25D95; Fri, 17 Jun 2022 19:40:03 +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 25HJe3il019086; Fri, 17 Jun 2022 19:40:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJe3fK019084; Fri, 17 Jun 2022 19:40:03 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:03 GMT Message-Id: <202206171940.25HJe3fK019084@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: c0584b324e9a - stable/13 - linux(4): Zero out high order bits of nanoseconds in the compat mode. 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c0584b324e9ae06f7c7906c92dd2431805e01b5c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494805; 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=+zgPuwbPz2neHPxtuUXVn3Tqxs8q5xzq8PZHSfFz6/g=; b=xGaAcavVMtSKfS5Rk10tvW+2HTPLsGDHur6W16sBw/8++6FAwgaFVZRRqiCPZH/EeOlGB8 7ItpcHp7tU4SKZH5yhzCaYuPlXX07Sb3Oods5ubo7tISR+qcGSWK00hqVGWK86yqRxEgMx MqigrOhLiH1PGgcDuWq+dt7El9kfeyyFcNjEoE8vka9NgTvclTIvCFH058Ht6Es+FfjOrQ /QlTdqqHmIYJ+IW2DrTgN/PsatInsSKrLHhGC0ArImB/UIT8wY/a39iWt9uMwg6DCrLWeY YtosFOfy3ORAniFMMlaxmdgJWwKyaH6ACV1GdXBhc08jDT4XQ2EboD3f83E7+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494805; a=rsa-sha256; cv=none; b=CvfgcQc1I9Q/SP3d0dpr3H1XyEtid2RNv6q+b9O4XFB42UrvQp/Pmp7ZnIOSUHm4bElelb XvV9hZb1wtFIn67BnKbian8y1W0q/mtjTvyNuDq8fGaz8ECf7ebNml79gWah90lwJtAdUX zN+OFykTbTrzDeHK6ZXFQjL5l6v2FSAWKbv//HCSGdh/cfsoL9PugDtj4+I94LngWA0v86 za8PTFy1SdrkK/pD8R3U+B4w4BhLUSBnjIqMEcVlndtfYSWlrFry40SnerEgzvm8o7oHl/ ZttLUsPiUlMO7SaQ3T0gG27LVx7F6neqPzKNIV/G1KZjimS2KyaxV+sbOET5nQ== 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=c0584b324e9ae06f7c7906c92dd2431805e01b5c commit c0584b324e9ae06f7c7906c92dd2431805e01b5c Author: Dmitry Chagin AuthorDate: 2022-05-08 12:38:19 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:34:58 +0000 linux(4): Zero out high order bits of nanoseconds in the compat mode. Assuming the kernel would use random data, the 64-bit Linux kernel ignores upper 32 bits of tv_nsec of struct timespec64 for 32-bit binaries. MFC after: 2 weeks (cherry picked from commit 1579b320f1a4d555250b82fa74a391d963e7ae13) --- sys/compat/linux/linux_misc.c | 3 +++ sys/compat/linux/linux_time.c | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 61de64b50489..d43289786611 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -910,6 +910,9 @@ static int linux_utimensat_lts64_to_ts(struct l_timespec64 *l_times, struct timespec *times) { + /* Zero out the padding in compat mode. */ + l_times->tv_nsec &= 0xFFFFFFFFUL; + if (l_times->tv_nsec != LINUX_UTIME_OMIT && l_times->tv_nsec != LINUX_UTIME_NOW && (l_times->tv_nsec < 0 || l_times->tv_nsec > 999999999)) diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index e97a1145d31b..d4f502eee7c6 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -177,10 +177,12 @@ int linux_to_native_timespec64(struct timespec *ntp, struct l_timespec64 *ltp64) { - if (!timespecvalid_interval(ltp64)) - return (EINVAL); + /* Zero out the padding in compat mode. */ + ntp->tv_nsec = ltp64->tv_nsec & 0xFFFFFFFFUL; ntp->tv_sec = ltp64->tv_sec; - ntp->tv_nsec = ltp64->tv_nsec; + + if (!timespecvalid_interval(ntp)) + return (EINVAL); return (0); }