From nobody Fri Jun 09 21:10:03 2023 X-Original-To: dev-commits-src-main@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 4QdDHc0w5Cz4cPlx; Fri, 9 Jun 2023 21:10:04 +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 4QdDHc0QQFz3HRZ; Fri, 9 Jun 2023 21:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686345004; 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=eBBvkHuPlYSOxK1vvSr9E0TsjmPbhgUTLHvjEonhLPQ=; b=WDxXvAgRNnLWXef60V4PZyijN3EkcgrgiUe4A1505OubgokarqRBdafrewRmKfkVfc1dgn ehKeDj7qvrxSFutLav2Cqxg59Lc1M5UvbwCDuBI0cGdDRBpQzJ7XWlKeuLLwo3o/F8T3Rs /F9TSvfwHACYDFYqThA/EyyYxOQknyf2v3DEE/e0vR5KrO63NTIEk2ya3mVNctyr2fbZWy mJaDJFWeC6E0NrdFrec7ssWwU6TkVx7iMdCZ5E3BVm/L1c6WIdyiFYgkyHNKQ8LoIDWN8s 1ByNZL6VuWvUchmQOPoErnk+D+eGyGXg6mExzKiVT5QCOu+X/TF/al3VnJIhtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686345004; 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=eBBvkHuPlYSOxK1vvSr9E0TsjmPbhgUTLHvjEonhLPQ=; b=utqJkmoy84p0ojuAsjFMgKTjL+U2uPq9nRZRYpZ6/xriHUPV/nrpGArJtk6cw50TtR0iLU sqfEGbcQKRAOB6TuBAYRJKAAu2WMs4btsFZ9DDx7Xnda0YqolBDTo3b1BpoOIWaeIVG02O yAFnuRIhqVdxYX8FP24nzworHnnUmW2EX+fQyF9x2CdPnNh6y+0qmKHRdtZfNd0RoJwS3Q vZDVLTDllJyBk1ou7vemRmLI2315+BbssipoEOxhkwR2k+n3F+NdtTLqmygbg0xgUbWXhR 76SEBCmaZeppZKHrx/b7cKoInxr7FRjOAzFFW0LSkGmZKwjnaaXq77QV0+0ZSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686345004; a=rsa-sha256; cv=none; b=X1eaCmS+Um78K5N5fNS2jVnWzauDNDUrhj9Jh5ZvuPS/BhmH8fpfOdWeBjCOzoSvXFxZk6 cGin6+hvc6lnd+7UmEUw0bN49C3vjdG7RL4MksaspBYgydU8SYY8asvaeEam2qMTA+LvIX Clxis5Pg0m8nVlYY0AKtSLX7NgeZrqsjPO2LAFLcIDrVgOum0j9dYrydfucs5rbBbGk0ax 60wg2YsyXJl8iuy4q5UCsuPgtrEVACNxdivqikrIBfkTuhE10G0yblm9foj65sNiVO0Sl6 zK0/+eCM519k6xqezZx3R+ZvXkMFAUMOQ61q7h95Sfd5t2I0YL7fFyXKgAmx0Q== 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 4QdDHb6dC1zqWG; Fri, 9 Jun 2023 21:10: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 359LA3So091564; Fri, 9 Jun 2023 21:10:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359LA3Wh091561; Fri, 9 Jun 2023 21:10:03 GMT (envelope-from git) Date: Fri, 9 Jun 2023 21:10:03 GMT Message-Id: <202306092110.359LA3Wh091561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: af9ce4e9bb7d - main - kern_ntptime: Fix undefined behavior of the shift operator List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af9ce4e9bb7d717279e02d46455e85ef6fb828f7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=af9ce4e9bb7d717279e02d46455e85ef6fb828f7 commit af9ce4e9bb7d717279e02d46455e85ef6fb828f7 Author: Dmitriy Alexandrov AuthorDate: 2023-06-08 09:08:46 +0000 Commit: Cy Schubert CommitDate: 2023-06-09 21:04:54 +0000 kern_ntptime: Fix undefined behavior of the shift operator L_LINT macro is used with negative numbers [i.e. L_LINT(time_freq, -MAXFREQ)], it could cause undefined behavior. It should be similar to the L_RSHIFT(v, n) macro. MFC after: 2 weeks Reviewed by: cy Pull Request: https://github.com/freebsd/freebsd-src/pull/769 Signed-off-by: Dmitriy Alexandrov --- sys/kern/kern_ntptime.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index 815a26182096..f4071219c951 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -73,7 +73,13 @@ typedef int64_t l_fp; #define L_MPY(v, a) ((v) *= (a)) #define L_CLR(v) ((v) = 0) #define L_ISNEG(v) ((v) < 0) -#define L_LINT(v, a) ((v) = (int64_t)(a) << 32) +#define L_LINT(v, a) \ + do { \ + if ((a) < 0) \ + ((v) = -((int64_t)(-(a)) << 32)); \ + else \ + ((v) = (int64_t)(a) << 32); \ + } while (0) #define L_GINT(v) ((v) < 0 ? -(-(v) >> 32) : (v) >> 32) /*