From nobody Sun Feb 16 20:24:17 2025 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 4Ywy1Z0cg7z5ntXc; Sun, 16 Feb 2025 20:24:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ywy1Y6Fnwz3t2l; Sun, 16 Feb 2025 20:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739737457; 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=UAHTy9di53vIRMK2N6EspVksOn2EQmrY0NLHgk0x/Ns=; b=usgE/eunHKTuDPNf+hnOWq8uhAqYYC+djjex3E0+OKLSppJOSECmmtBEoSadqtSk8ypRRz KPPOiuSu2vUut79kEh4IpbtyQAE/GcRnfLwol8PsjRrmXEVMYjL06BiQPehDrhroShhKKJ Yjfx/jvA5fMyNQd8hhctKaAGxHiFshz1D4Vg5bQyWfsD7wctlyqTuTA7WCLZo1efGT/QgO 91Q34AN4Ej5xrMaQLa1Zo+RiFVR2znVUQGDD5aQ24ScVxAg+Kv3CmwZM4UnvGM8k3jQP8s re4NOQDnRQcEn/8aX21j8i2ksMhrPexwpIHUcyyDY73N181+axX/D/Jg0eKK3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739737457; a=rsa-sha256; cv=none; b=mPmzXhaRS83rZAXgs/T0jfaKSfiU98Vj/h5QhbSrpHdyPokBHygeub1kv2qqnGkzQnOj77 ttqwbh7ZcBLd1xATwD1rhZqnS5KDibAPJzSz/gWr87UFmmACWofNusaDt2wTKeunZGjcb2 LjWtKoaeLdbTKXlj+sJQ54VoLe+UwScjXQV4Xc3Ch0tcjK9YJeaxcB8v9pVo0QYIIoOK41 r8aIwYkVhtQYoQXr6K6/J4tTi16SORISQynTWeddtBWnVvvYdPDlr46UM60/BDNjvxKhZ1 ZEN88LPtz0kg3ZmXNNCAcYHZcQEPdbdkjPp+dbrnWtxpa8mKbe6UEtpbTwIutw== 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=1739737457; 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=UAHTy9di53vIRMK2N6EspVksOn2EQmrY0NLHgk0x/Ns=; b=QAqlgTIxJ5nZOHKhEVeBuHqi1wB5OZlO1Qk8UxG2RWsATWk57E/Mvrns3LmZGb8CRf+nwq ycxyEdIMDl/cSZvILc7pD2d5WRhnL7rCQ6JVq0V5Ps8CHlGKArBVIRaFctIWh4SKWwNcND BUycPJlC92/nM35EiONU2KgbWFodQJIVikxJenR1CaQH2SWHxDODULqluriaZO4HJus5Pn cqThddpRWeQdvaTfcxguVldFkMMcSN246THX21nreujaerOzCgdVMhzjDZj8M9Ycazwm0f yhMYEn0D42fThGDORMXo0Nun3zJ9yb2wQdLGDM9/2Y+4fb3odyM/CAMMy48dxA== 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 4Ywy1Y5pTRz12JT; Sun, 16 Feb 2025 20:24:17 +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 51GKOHPA082377; Sun, 16 Feb 2025 20:24:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51GKOHU4082374; Sun, 16 Feb 2025 20:24:17 GMT (envelope-from git) Date: Sun, 16 Feb 2025 20:24:17 GMT Message-Id: <202502162024.51GKOHU4082374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3afc0bfecb1a - main - net80211: crypto: ccmp: fix more hardware offload bits 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3afc0bfecb1a927c37672dc245688c575e4d9ec4 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3afc0bfecb1a927c37672dc245688c575e4d9ec4 commit 3afc0bfecb1a927c37672dc245688c575e4d9ec4 Author: Bjoern A. Zeeb AuthorDate: 2025-01-27 13:54:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-16 20:23:01 +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 MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49030 --- 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");