From nobody Sat Dec 31 02:33:04 2022 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 4NkR4d0CSwz2lB5P; Sat, 31 Dec 2022 02:33:05 +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 4NkR4c4K5Xz4HLm; Sat, 31 Dec 2022 02:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672453984; 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=tsQQnNpynq3SHk6Y0Rpy3qntjnSrYGap/WUSD2/kv4A=; b=pJXChKOaQuRE3G0qzvMLRsMRQK4QBdOBkx3QM1Nfo6k7zqWZKZ/CIG3ZFJvM2nJTF0kroH cgtREDtz9F50BHyiDlQ2KMxd7+dyzGkIHyPPKFAMm70C9r2XJO52/X3Ky3PnositqGI5dg Y1rr/6JyuGKdDRRlGnrjxtryrkAENjj5OZ6tsphDpo3iF9yx4jFJRh3OFNtRPZJ3BYzwQT omRtfvN2LIqVJohguYrh1oDY409DV5PKFCK28MtFSZU63tgO44RtcvaIXVK+SGQGHeedXE wHYYqEtgGa9hbYEECfrTYiT2hKSliR6Fl0iHfgyC7NKm2HThCLWyP+M5OWoM+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672453984; 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=tsQQnNpynq3SHk6Y0Rpy3qntjnSrYGap/WUSD2/kv4A=; b=S4yrIGCh9mV/jZvlkGTWOO7/3/vxUW9PzJLoZn4d/GVKO8ovmE0LzoKCYeduwoxxAjQtza CkKowgPLyrOU8ccFPtj9lHpgiREAmRwsTdQbr8kaH10T1VdKf/jYnMQl7sEa/LJRbCCkxt 5i2n3zRPKvCRELCaLUNAehgcm6FYH3O1/Fuq9AWAwBHAHeN6ix0gJlQ/JG/82F2rXumUi+ NdhpLHRW9KQeULEFlDVco+L1mim4PrGhSsnf8+Cyq6+T+6RgPUDGM+GM78COIGNcrftfT4 JQSt3u5WONTa/c72ht3lXn6G/5evnWMn9aamewjN3vfKSVirsUeUYC+q7vNV/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672453984; a=rsa-sha256; cv=none; b=Q8yI6uKL0H3FBtB0GBw8SbA+eiQt17tl6o6jy4rCHhp020bBdhahRYGm8+IL8LuEOwqO55 vsY5Xd+XrrYb8rAHYnbr2ynqndRPE8dzu+FOlfTxWdybHyzLkD2yiaK7via7ohsThnAD99 huvHpnn6+w1S5/RDckNgv86Cf3I+EdcPSmMPWPSgNC+h5UVOi4otWznZgQgOlleHxRbmgQ m8hghswO3Suw21dh0L9nTY9Eu6ZWflqo0fz+xfP3GnrIybIcg8lcwo868OnSIThK/28ekk 3r3gDmqs/+QUuTqtSLwkfZZef+6AHNf9ZjDMva96pRrnBIyuUIvBmzNku5pjfw== 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 4NkR4c3Q45zXct; Sat, 31 Dec 2022 02:33:04 +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 2BV2X4Ql021169; Sat, 31 Dec 2022 02:33:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BV2X4Lm021168; Sat, 31 Dec 2022 02:33:04 GMT (envelope-from git) Date: Sat, 31 Dec 2022 02:33:04 GMT Message-Id: <202212310233.2BV2X4Lm021168@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: 339119949660 - main - LinuxKPI: 802.11: implement ieee80211_get_hdrlen_from_skb() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 339119949660916aa40b1d67dbe002dd7eb0d709 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=339119949660916aa40b1d67dbe002dd7eb0d709 commit 339119949660916aa40b1d67dbe002dd7eb0d709 Author: Bjoern A. Zeeb AuthorDate: 2022-12-31 02:02:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-12-31 02:02:01 +0000 LinuxKPI: 802.11: implement ieee80211_get_hdrlen_from_skb() Implement ieee80211_get_hdrlen_from_skb() doing basic sanity checks on lengths (minimal length or skb data length vs. header length). Sponsored by: The FreeBSD Foundation MFC after: 10 days --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index ce2cdb3327f8..55a74227a338 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1720,12 +1720,23 @@ ieee80211_get_channel(struct wiphy *wiphy, uint32_t freq) return (linuxkpi_ieee80211_get_channel(wiphy, freq)); } -static __inline size_t +static inline size_t ieee80211_get_hdrlen_from_skb(struct sk_buff *skb) { + const struct ieee80211_hdr *hdr; + size_t len; - TODO(); - return (-1); + if (skb->len < 10) /* sizeof(ieee80211_frame_[ack,cts]) */ + return (0); + + hdr = (const struct ieee80211_hdr *)skb->data; + len = ieee80211_hdrlen(hdr->frame_control); + + /* If larger than what is in the skb return. */ + if (len > skb->len) + return (0); + + return (len); } static __inline bool