From owner-svn-src-all@freebsd.org Tue Dec 1 19:37:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2F2304B2698; Tue, 1 Dec 2020 19:37:38 +0000 (UTC) (envelope-from gordon@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ClsnX668Kz4lsR; Tue, 1 Dec 2020 19:37:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A980C1AF2D; Tue, 1 Dec 2020 19:37:34 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B1JbYRJ004283; Tue, 1 Dec 2020 19:37:34 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B1JbYgc004282; Tue, 1 Dec 2020 19:37:34 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202012011937.0B1JbYgc004282@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 1 Dec 2020 19:37:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r368254 - in releng: 12.1/sys/kern 12.2/sys/kern X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 12.1/sys/kern 12.2/sys/kern X-SVN-Commit-Revision: 368254 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2020 19:37:38 -0000 Author: gordon Date: Tue Dec 1 19:37:33 2020 New Revision: 368254 URL: https://svnweb.freebsd.org/changeset/base/368254 Log: Fix race condition in callout CPU migration. Approved by: so Security: FreeBSD-EN-20:22.callout Modified: releng/12.1/sys/kern/kern_timeout.c releng/12.2/sys/kern/kern_timeout.c Modified: releng/12.1/sys/kern/kern_timeout.c ============================================================================== --- releng/12.1/sys/kern/kern_timeout.c Tue Dec 1 19:36:37 2020 (r368253) +++ releng/12.1/sys/kern/kern_timeout.c Tue Dec 1 19:37:33 2020 (r368254) @@ -1270,7 +1270,7 @@ again: * just wait for the current invocation to * finish. */ - while (cc_exec_curr(cc, direct) == c) { + if (cc_exec_curr(cc, direct) == c) { /* * Use direct calls to sleepqueue interface * instead of cv/msleep in order to avoid @@ -1318,7 +1318,7 @@ again: /* Reacquire locks previously released. */ PICKUP_GIANT(); - CC_LOCK(cc); + goto again; } c->c_flags &= ~CALLOUT_ACTIVE; } else if (use_lock && Modified: releng/12.2/sys/kern/kern_timeout.c ============================================================================== --- releng/12.2/sys/kern/kern_timeout.c Tue Dec 1 19:36:37 2020 (r368253) +++ releng/12.2/sys/kern/kern_timeout.c Tue Dec 1 19:37:33 2020 (r368254) @@ -1271,7 +1271,7 @@ again: * just wait for the current invocation to * finish. */ - while (cc_exec_curr(cc, direct) == c) { + if (cc_exec_curr(cc, direct) == c) { /* * Use direct calls to sleepqueue interface * instead of cv/msleep in order to avoid @@ -1319,7 +1319,7 @@ again: /* Reacquire locks previously released. */ PICKUP_GIANT(); - CC_LOCK(cc); + goto again; } c->c_flags &= ~CALLOUT_ACTIVE; } else if (use_lock &&