From nobody Fri Jun 23 04:35:37 2023 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 4QnPYj6p58z4gP2D; Fri, 23 Jun 2023 04:35:37 +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 4QnPYj58CXz4P6D; Fri, 23 Jun 2023 04:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687494937; 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=uDaPD0DdRUCZnFrMXmpaEDXej0vCnLh8tn/CiIxjcEg=; b=BqxZJqcwkjAnYL+8IKgVHnZNZ3cIZrxlkQmdVUnEdATnkA2XtZWWkkqP2c94TJGatcMqr0 Km9qPpZmUjfLBHUv4K1d2uqC/mUcI1/WEw4+1fXmnPrVkb7MyRJ2Qh9McwqnJrVoItLfmM +iHpzANTI2/DmRkNnaZ9mBSw0C0N+8R0yXHU0gkC1VqqCJk07MlHOVShRQViPDsBslzCqQ 1kpGNWrquqC/+gjgr4lv1qsH1/KwuB6LdtIfVwDZtysEUP3b0SGgXiQ/auouJa0j6H3rPF Xfh8M3z1nIY/QN8nWqJqS05H8gc9njGSnO38x1FJtFwibuLY8L6Q/qvCrCiFTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687494937; 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=uDaPD0DdRUCZnFrMXmpaEDXej0vCnLh8tn/CiIxjcEg=; b=R4nQ804mTT8syYLs22Drfqny+nWBcRzfis0ciJRCmd42t3B/CEPZ4Z7QEhgY+ZtyxgUnak 43Jir2s5yfk/hpPxEGXtXdj2zU0oEhy3It8fT13X8RiZ5Zr5PF/A4qM35SZC0EWxxZtJEP wXyjjrUIiGAfgOwmzq1t8WNNGb9QnPY6wCIW0/AxPg9nDnh8WVJ2C91CZba42Tgx+tnrV2 LeD9d6RGktJUwwg2thm/KGAlHyrrGMnjxRx6yjw7IavEZF/6AKEPx2c2iE33Fka3FeifG4 w8OJtjWGeh/UKscb1FBaF7G4Df6LCfNkTdiww2whruC51ldb72i9UedXaisBIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687494937; a=rsa-sha256; cv=none; b=DKb/ydB2LODHOgcHyCGp9cMKbPjGTOZywD0xUOkEIDkiCYfXtYe9j1/u/h1oF+IIaLdit0 xElxiMhwt2YMA0/cAne9si0kLS2S9rjqVcbuMLvRnbTNZvNndKD8+FKJmrBXa5SnGHRCCq LIS6aX0+wme3CEmxGK7CJp2IeJ7yOclTJ06gf6H8+61w5+1EMIV82LTA7DnQOLszffdLls beciI8BuD5z796VPnfLM3yN0ntPYj5OHfcOYQEAISpw/jdWZYWepUlmqNvqqacxiF8V/Fh 2UJ8qx/dQ5vmqCBflrmq/3B4Cos/F4Xzf36/0//WkWeUcYAoY4SU2NRrxpVxgg== 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 4QnPYj4D59zrWR; Fri, 23 Jun 2023 04:35: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 35N4ZbY7099238; Fri, 23 Jun 2023 04:35:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35N4ZbRf099237; Fri, 23 Jun 2023 04:35:37 GMT (envelope-from git) Date: Fri, 23 Jun 2023 04:35:37 GMT Message-Id: <202306230435.35N4ZbRf099237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 8711fd2103d2 - stable/13 - kern_ntptime: Fix undefined behavior of the shift operator 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8711fd2103d2a580bd4671f3f1c7da0fc791e5db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8711fd2103d2a580bd4671f3f1c7da0fc791e5db commit 8711fd2103d2a580bd4671f3f1c7da0fc791e5db Author: Dmitriy Alexandrov AuthorDate: 2023-06-08 09:08:46 +0000 Commit: Cy Schubert CommitDate: 2023-06-23 04:34:11 +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 (cherry picked from commit af9ce4e9bb7d717279e02d46455e85ef6fb828f7) --- 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 a8418248abd7..7e0595c4b643 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) /*