From nobody Mon Feb 24 20:27:11 2025 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 4Z1sjD6zXdz5pq40; Mon, 24 Feb 2025 20:27:12 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z1sjD3h8Sz3njC; Mon, 24 Feb 2025 20:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740428832; 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=+2+EbZHH3SQ2mu7iisAAptsUqrqRPVTNTl7sEweS3+4=; b=r09A5tUaX+kdoSeyaITL4Jl298ehdpnG9mzlkM8OKIhQhneVXOz7DJMCMHOYiM9m/aHILw gfGJd1olTy9+FCUkZ9ktcUs1HXhEp/ljZWsHiqzJ4PE/M/HEWtBGbe5BhSaTZTldIsU0bP m8HnBkwzhMetNLPe8AyzI1d8lMcotayqTmLysgpXo0aOTGZpMPoXByGVej2rlbvZ9LNcNP gX912W9cwTLY+s2rWKGJgdgs1vrcGWX6j2xBk0e+/dSa+DmApd1CdTwjCPZ50TND5mSoIF w7QvNo+tu9upToMn7IRtKw6tcv7E9Ci4RW8cy9p1qMtOu4LqcNAiwU722kPfag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740428832; a=rsa-sha256; cv=none; b=nF93kqeCKChHYsAvirtKcUkguHk+Gov2dEfUeHa/7eX2JPRrHSpeCG64ttqM4FELOftauw s3xyDJw25OgnMIY0vRPSpd6hDGsyB2hUQ1TG78U7m3O89/JIH9SCQvaIqNwB6zJ9ojnqhL eW444IeJvSCfc5AjLpOz1r1NaJiYWlJU0TBoBy1Dm2zUuPUVyv8PMW/JF8kFyw0m9vVdzr 1pNP/10OoUD4bpbxArxCUJrm5ZSnqsk70nl38wn5e6WurGAsZ00vF96Cl0coovTb7Vsm/i 19q3yTPVNGJoyq6M0lVvzdcWwrne2m2xnk+wT357gOqIkKbOvEIISocm6tJYGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740428832; 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=+2+EbZHH3SQ2mu7iisAAptsUqrqRPVTNTl7sEweS3+4=; b=R8JyV6tbmwdhEmsv+OGbw+pWE4emHmpRNlxzrd5ZX7WK7JyG83nieah/y4/2JqHalLYvj0 7ot0lkwkPGcoU88ALGdp2L0qagjqDomcosdO20aFZU6HayUzRYhrRMU2j7qLd4Yyt2TdeN ea4QVxyF07MDxFKaAXJsQltCIDKXFqQQqgE2lTI4npWsm0MKs8PN9nkpDXU3OMATIGixAJ eVaTiZM4nJX85+aoxJCaD3pJs1K/SOJCYhgU3oBbnWsZAR4iSy6ieiE6n9dxatPzAex+Vl yvFb+OsMNtVIGg96XnMile89Q+YIZj01BiQuVp31FiPp2esq1JrcLEc6KjKnzg== 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 4Z1sjD0RxMzw3Y; Mon, 24 Feb 2025 20:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51OKRBCH027308; Mon, 24 Feb 2025 20:27:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OKRBOG027305; Mon, 24 Feb 2025 20:27:11 GMT (envelope-from git) Date: Mon, 24 Feb 2025 20:27:11 GMT Message-Id: <202502242027.51OKRBOG027305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e8376bc284f1 - stable/14 - net80211: crypto: ccmp: fix more hardware offload bits 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e8376bc284f187e0299def398259a9a4ecdeb61f Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e8376bc284f187e0299def398259a9a4ecdeb61f commit e8376bc284f187e0299def398259a9a4ecdeb61f Author: Bjoern A. Zeeb AuthorDate: 2025-01-27 13:54:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-24 20:26:48 +0000 net80211: crypto: ccmp: fix more hardware offload bits Add the missing IEEE80211_RX_F_DECRYPTED and IEEE80211_RX_F_MMIC_STRIP (really just MIC_STRIP) checks to make hwaccel offload work. This makes rtw8x drivers pass RX packets again at least with LinuxKPI if HW_CRYPTO support is enabled. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49030 (cherry picked from commit 3afc0bfecb1a927c37672dc245688c575e4d9ec4) --- sys/net80211/ieee80211_crypto_ccmp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/net80211/ieee80211_crypto_ccmp.c b/sys/net80211/ieee80211_crypto_ccmp.c index 8f7d5eed593c..06028cf2a37c 100644 --- a/sys/net80211/ieee80211_crypto_ccmp.c +++ b/sys/net80211/ieee80211_crypto_ccmp.c @@ -602,6 +602,7 @@ done: static int ccmp_decrypt(struct ieee80211_key *key, u_int64_t pn, struct mbuf *m, int hdrlen) { + const struct ieee80211_rx_stats *rxs; struct ccmp_ctx *ctx = key->wk_private; struct ieee80211vap *vap = ctx->cc_vap; struct ieee80211_frame *wh; @@ -613,6 +614,10 @@ ccmp_decrypt(struct ieee80211_key *key, u_int64_t pn, struct mbuf *m, int hdrlen uint8_t *pos; u_int space; + rxs = ieee80211_get_rx_params_ptr(m); + if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_DECRYPTED) != 0) + return (1); + ctx->cc_vap->iv_stats.is_crypto_ccmp++; wh = mtod(m, struct ieee80211_frame *); @@ -675,6 +680,14 @@ ccmp_decrypt(struct ieee80211_key *key, u_int64_t pn, struct mbuf *m, int hdrlen space = m->m_len; } } + + /* + * If the MIC (we use MMIC despite not being Micheal) was stripped + * by HW/driver we are done. + */ + if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_MMIC_STRIP) != 0) + return (1); + if (memcmp(mic, a, ccmp.ic_trailer) != 0) { IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr2, "%s", "AES-CCM decrypt failed; MIC mismatch");