From nobody Thu Jan 20 14:58:41 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 9AB57195B545; Thu, 20 Jan 2022 14:58:41 +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 4Jfly93xYCz3lf6; Thu, 20 Jan 2022 14:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642690721; 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=k0F5628VGGkLQ3VlaSZpWgp4jIrI2YtSlGwvVb5I3vc=; b=nmVaybYK5EHr08CCZSiLxfx2HgJAA+RPD7HfgAW2PtBvjFB26lXy3S5mwBgR7LpiNF8UAp BSFmoiKqGquAgPMJft65+uqGFavDqAma4Q0xyPVFpVCIFX+uRHB6oXSl5kaRDHYA7so2r+ N+qlUGk/a3ozjdasoXEZGSJMuXeTXWV8bkocVVADOdu2ZEpo5qy++SALwvkmmY6ZLWben9 Wn/HTDrbvpMsGcevHsvcTcaUVFMW0qGZb1TIlSBv5vY6A1nz+EKJB0vSiT48SmFQHTBcJC DQTjWj0nGDfWDaq/J/pIFdtc/gFZyS3WHF34Lv8COIuXv/UAmvaNhYLKuVygug== 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 6698C2366; Thu, 20 Jan 2022 14:58:41 +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 20KEwf9a078539; Thu, 20 Jan 2022 14:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KEwfeA078538; Thu, 20 Jan 2022 14:58:41 GMT (envelope-from git) Date: Thu, 20 Jan 2022 14:58:41 GMT Message-Id: <202201201458.20KEwfeA078538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c3196306f092 - main - clockcalib: Fix an overflow bug 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3196306f092e46008d5ffa626fbafe1f8a94848 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642690721; 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=k0F5628VGGkLQ3VlaSZpWgp4jIrI2YtSlGwvVb5I3vc=; b=HrHnwuNDvW6KploXiTYgZKdEPp0LEXQ0ulMqn9cMm9KeOc3z+91Q5nfw2Pb0mQJvLbrRtG YRJf3P7ahu3dP9C2w6IQhM7WhWkcFMstl58oblJlDnOptQU76zbJp7xd4PIHDJ08OpIC3t e7l5JH5IFGpWeBZ129RbXUbXA+3zitcyhRlsWDkrG6RTCWFGm1GfJTB3rZxMziYchjNXCN ZnJAQcrPF9gz4ogLfBUS0y13K6E/8I9vqBZEgbN3NEZPsBZwC+Jc0zO0SgqlkZ+k2RZz6J hCplkzfN14c08llIiCLiuuII2RrnpIQFM5q1tfsqVnt8NaYpvTu5IoGLBZyGqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642690721; a=rsa-sha256; cv=none; b=kEBzU5sb0vmfvYTe6xZcrFBrdQc8zV0XM30PCT7/vuHQBNQjkUQD6gI1R0Y0Ke0l+zJ+Z+ zLIxcgWkAl0c5Hjck/YabDZW09X7unx1slqUOMs+wlxxr1ytG+yj6GACcwqFJC8kVLfhe5 F6F9iIi5XPRZqDVKfc+g9b8Gc0N3Uo8QPfbcohD/6OO3Xr3tI92rKPx/y3S6x+ksDDgnDo 4mfnTNmfVE/j8iAtRgFb/2il8bTA7ZfMMVrB0g32HB1Oc/bRX4iAADOX58iKmkRDajo7AK MOErFXxK4O1zSqPPePo3fcBCyobPv4PGE4nEx3/WNqJz4iufhdFRJRPuTpjMrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c3196306f092e46008d5ffa626fbafe1f8a94848 commit c3196306f092e46008d5ffa626fbafe1f8a94848 Author: Mark Johnston AuthorDate: 2022-01-20 13:23:38 +0000 Commit: Mark Johnston CommitDate: 2022-01-20 13:23:38 +0000 clockcalib: Fix an overflow bug tc_counter_mask is an unsigned int and in the TSC timecounter is equal to UINT_MAX, so the addition tc->tc_counter_mask + 1 can overflow to 0, resulting in a hang during boot. Fixes: c2705ceaeb09 ("x86: Speed up clock calibration") Reviewed by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33956 --- sys/kern/subr_clockcalib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_clockcalib.c b/sys/kern/subr_clockcalib.c index 2d6a8c31a9b9..3e93dd0869bf 100644 --- a/sys/kern/subr_clockcalib.c +++ b/sys/kern/subr_clockcalib.c @@ -108,7 +108,7 @@ clockcalib(uint64_t (*clk)(void), const char *clkname) clk1 = clk() - clk0; t1 = tc->tc_get_timecount(tc) & tc->tc_counter_mask; while (t1 + tadj < tlast) - tadj += tc->tc_counter_mask + 1; + tadj += (uint64_t)tc->tc_counter_mask + 1; tlast = t1 + tadj; t1 += tadj - t0;