From nobody Wed May 24 16:29:42 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 4QRGqV5G0Hz4TFXp; Wed, 24 May 2023 16:29:42 +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 4QRGqV4lpkz46lg; Wed, 24 May 2023 16:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684945782; 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=XhUj+JHEaXvEBjyczR45LiLFGa9LIeMw/cTI/9N9SNA=; b=tsCnnRTJQf1W/YKrH34Gl5npDx1JMcfqzXe0nskz1+Pb6uKoSdYRWSjbxkvSjeMZmR9gkX zAiSGRnklCNl7HrGLuZnb0Z9/IDOIdkcsNcCojNw1hkJI7Zmbvf1zByrBmjvSkvDjx4x9e SwNQqpIS+oStEyDhbUWKNNNFp5vX3ROvJ0NA9PkfkAICRNR5Il3EHAt3FK79UbCo2AZL1M PALs51omajNkIPEzldGis7VYmsEZ3Ok45gjBtHytfJt1fMtTP6jtGyRawSdOAVybdGDFzR 4pVgVYlY1MKItzBA1eUX8cw4hixkQc/XjkR/1rTOYUsRxxZ02sLzJ6WILdoNKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684945782; 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=XhUj+JHEaXvEBjyczR45LiLFGa9LIeMw/cTI/9N9SNA=; b=dlPl0BoT+5LpiTW5dNI5lkG9zUbYrRb6ztyqwzOxJKIFEE7sZaCseWwuwfiB8gYnb3A1tv eVAGLxB2VZNPXAp1/aDl35e4+wP+Mf6Fx1tZmHYK8OhXY62cEjUV05SqU/ux/3YZOMPQcO BKJBx1r46Xc89N6RB9bA1iLq/SSbFWKuyWY2UdUbe1AK4wu61RpnPiktWDj9r8SvqEXGYh cn23fY9boxSNnvDoO42w0AD/VozrdEiYp5Nz8Fz9DEnH4t76tStJAf20CNzgh7cwk9oItP cuFZfufJuUhRTIcvv4W3e/0URo53PPeCqYHg4lvcNGvujRL21BgPZhut5EqpEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684945782; a=rsa-sha256; cv=none; b=Cq1NnlpOrbfOIamsPo29tJerio6w2jzAdQ67NYpabcbXqHzUdkL9wbS6vJMEA9W652VZm7 ypEUEtddFFt0OlTYl/45lvknc+BjQlbd2s3S2Mnlkxqc8wWGsNc9MztAtXBIsqJoAS2L5N N7B1MtZYGb3DCAKxw1thiEBJOu5Y5kNOtNh5yo0AkUenFm5mYXZ0jYKzQDg2Ex/FU8b/NV Dm4SiG+AsZZJn88Q27KANaWF3+s0Z3F1Z2L10bM6llili1H/X9cTCCyLR/iqmlCiKBngZa L6y83m//RjHYadfilTYWPuE3bSNgRsCwnFMAWUL0ItiDvOnuYhwVaoLbImN4Yw== 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 4QRGqV3j1Nzpgf; Wed, 24 May 2023 16:29:42 +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 34OGTguf087627; Wed, 24 May 2023 16:29:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34OGTgmO087626; Wed, 24 May 2023 16:29:42 GMT (envelope-from git) Date: Wed, 24 May 2023 16:29:42 GMT Message-Id: <202305241629.34OGTgmO087626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6342c9ed178e - main - if_ovpn: atomic_set -> atomic_store 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6342c9ed178e6507d29accd07f1d53bb827162f7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6342c9ed178e6507d29accd07f1d53bb827162f7 commit 6342c9ed178e6507d29accd07f1d53bb827162f7 Author: Kristof Provost AuthorDate: 2023-05-24 16:27:53 +0000 Commit: Kristof Provost CommitDate: 2023-05-24 16:29:21 +0000 if_ovpn: atomic_set -> atomic_store The intent is to set the value to UINT32_MAX, not to |= UINT32_MAX. Happily the intent (ensure that we do not send further packets) is achieved either way. Reported by: markj Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 49c8c8e9677a..a05b06f090e3 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -1885,7 +1885,7 @@ ovpn_transmit_to_peer(struct ifnet *ifp, struct mbuf *m, /* Let's avoid (very unlikely, but still) wraparounds of the * 64-bit counter taking us back to 0. */ - atomic_set_64(&peer->keys[OVPN_KEY_SLOT_PRIMARY].encrypt->tx_seq, + atomic_store_64(&peer->keys[OVPN_KEY_SLOT_PRIMARY].encrypt->tx_seq, UINT32_MAX); return (ENOBUFS);