From nobody Tue May 23 14:12:58 2023 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 4QQbrC1hSHz4CWht; Tue, 23 May 2023 14:12:59 +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 4QQbrC0xdDz41Wp; Tue, 23 May 2023 14:12:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684851179; 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=GXvaUMqHQvlOuA1jVjyD7+X94taq1MHzzqJmthDDOYQ=; b=VXqD8pV2mPRaoUFFfMRo0sIDMKhPCZkDaJakP3kzekeW/q2W6Ul6sJHaje60HZwU+a6CLD Cb7LcLFT1D9NfF7aZ2JhSDCONlo6y6JcK7CRZTrXpdP86R7cXW2+Lt82stKWhmv6SuhtyM OAIlaVMDPdtwBnACSDrwLDotSZ3SWhFGTWK3NIaoZYUjFt1kz1AlyI985/uXBmqFMC1YS0 TfdDkO8ZZxYGMDEn8mUwdGxMHGnsPqjAJC2yNr4bAOuqrmQiAPn3Pi3PUOpcr/Be6BY6ZR 9HoMeGpLDuqws08ylTPVgAXo+otxHmZzxMecFf+3E4cJnNLkbanzzkITCfL5xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684851179; 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=GXvaUMqHQvlOuA1jVjyD7+X94taq1MHzzqJmthDDOYQ=; b=p0NC1nWMgbEPlmtEQ80bMBMDHYh5jfP80Fn2R6dyZcyYf/GLeByFRPI8TqpOKQhhvUuaT2 3Fmp2EM71HrGNC5pzu3dG4Slwp495AgP50oKAGrOcZtxGlOXqH8XltLuqjUSFTMPfC88NZ YKffEngM/7v8ZBfksSqGjmrd3sC5fhojSzfmtNUsdPKYIeFZK8DVCNUVtiJhjKxlNCQgGv umdc2teQw5M+lm6faUdCkC9DNKAJR0TbPAKb1KLmjYQa86nrsdDKhiIHd8W8E6YXZ//1Jl 5x5HhN6awrXg8gyFN9wYvo1hnkkB3W9xBoPfNfuEuaPYLj97LnPeApzxaJV6fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684851179; a=rsa-sha256; cv=none; b=e/1RG3s/jPjGITlhQ69cZ4LltEh2nNjQHschY+p6g18VtBokTtJN+jpqOjdA1ccEI3MeZl 2MnVWER6jxN/E27dS27AAOidY3if7Yottim8nIE8gvv2r2jDp1NCGlxhh4tPDH6CzGXZ65 HEi6EJE4O4z4n5EBihKLjKOUSrvwRQfUKZFzIrwMDwCfDx680kNW9FqQSGyuWH4t/oxnMj vBQeBpPlmDKSF7bvsdnIcRFrlLrCMY2jTE19IqdlwHxvypTHrA6EfzNFjSqsKzj4QMroGr 29/fzc+Z0/VqR3jJw7E8qOaU2pYSXUekzTlS7xgkKoQWmigTdpw5PNIz9lYmjw== 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 4QQbrB724lz12fR; Tue, 23 May 2023 14:12:58 +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 34NECw3J098686; Tue, 23 May 2023 14:12:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NECwcN098685; Tue, 23 May 2023 14:12:58 GMT (envelope-from git) Date: Tue, 23 May 2023 14:12:58 GMT Message-Id: <202305231412.34NECwcN098685@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: 81877287a99e - main - if_ovpn: ensure we never re-use sequence numbers 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81877287a99e55b47a7045efa76945f368e90917 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=81877287a99e55b47a7045efa76945f368e90917 commit 81877287a99e55b47a7045efa76945f368e90917 Author: Kristof Provost AuthorDate: 2023-05-20 17:43:49 +0000 Commit: Kristof Provost CommitDate: 2023-05-23 14:11:26 +0000 if_ovpn: ensure we never re-use sequence numbers if_ovpn already notified userpsace when there was a risk of sequence number re-use, but it trusted userspace to actually rotate the key. Convert the internal sequence number counter to 64 bits so we can detect overflows and then refuse to send packets. Event: BSDCan 2023 Reviewed by: Leon Dang Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D40187 --- sys/net/if_ovpn.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 3aec073c052e..49c8c8e9677a 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -93,7 +93,7 @@ struct ovpn_kkey_dir { * strictly higher than this. */ uint32_t rx_seq; - uint32_t tx_seq; + uint64_t tx_seq; /* Seen packets, relative to rx_seq. bit(0) will always be 0. */ uint64_t rx_window; @@ -1830,6 +1830,7 @@ ovpn_transmit_to_peer(struct ifnet *ifp, struct mbuf *m, struct ovpn_softc *sc; struct cryptop *crp; uint32_t af, seq; + uint64_t seq64; size_t len, ovpn_hdr_len; int tunnel_len; int ret; @@ -1873,11 +1874,24 @@ ovpn_transmit_to_peer(struct ifnet *ifp, struct mbuf *m, ohdr->opcode |= key->peerid; ohdr->opcode = htonl(ohdr->opcode); - seq = atomic_fetchadd_32(&peer->keys[OVPN_KEY_SLOT_PRIMARY].encrypt->tx_seq, 1); - if (seq == OVPN_SEQ_ROTATE) + seq64 = atomic_fetchadd_64(&peer->keys[OVPN_KEY_SLOT_PRIMARY].encrypt->tx_seq, 1); + if (seq64 == OVPN_SEQ_ROTATE) { ovpn_notify_key_rotation(sc, peer); + } else if (seq64 > UINT32_MAX) { + /* We've wrapped, give up on this packet. */ + if (_ovpn_lock_trackerp != NULL) + OVPN_RUNLOCK(sc); + OVPN_COUNTER_ADD(sc, nomem_data_pkts_out, 1); + + /* 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, + UINT32_MAX); + + return (ENOBUFS); + } - seq = htonl(seq); + seq = htonl(seq64 & UINT32_MAX); ohdr->seq = seq; OVPN_PEER_COUNTER_ADD(peer, pkt_out, 1);