From 739e000bbfc653c51cf76068d1510d7ab7720143 Mon Sep 17 00:00:00 2001 From: Sophie Brun Date: Wed, 16 Sep 2020 15:00:46 +0200 Subject: [PATCH] New upstream version 5.3.9~git20200829 --- .gitgnore | 0 Makefile | 3 ++- README.md | 2 +- core/rtw_security.c | 17 ++++++++++++++- include/rtw_security.h | 2 ++ os_dep/linux/ioctl_cfg80211.c | 40 ++++++++++++++++++++++++++--------- os_dep/linux/ioctl_cfg80211.h | 4 ++++ 7 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 .gitgnore diff --git a/.gitgnore b/.gitgnore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile index 23f7b5e..043d673 100755 --- a/Makefile +++ b/Makefile @@ -1032,7 +1032,8 @@ EXTRA_CFLAGS += -DDM_ODM_SUPPORT_TYPE=0x04 ifeq ($(CONFIG_PLATFORM_I386_PC), y) EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -SUBARCH := $(shell uname -m | sed -e "s/i.86/i386/; s/ppc64le/powerpc/; s/ppc/powerpc/; s/armv.l/arm/; s/aarch64/arm64/;")ARCH ?= $(SUBARCH) +SUBARCH := $(shell uname -m | sed -e "s/i.86/i386/; s/ppc64le/powerpc/; s/ppc/powerpc/; s/armv.l/arm/; s/aarch64/arm64/;") +ARCH ?= $(SUBARCH) CROSS_COMPILE ?= KVER := $(shell uname -r) KSRC := /lib/modules/$(KVER)/build diff --git a/README.md b/README.md index 4a997e9..595b902 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ * MESH Support * Monitor mode * Frame injection -* Up to kernel v5.3+ +* Up to kernel v5.8+ ... And a bunch of various wifi chipsets # Howto build/install diff --git a/core/rtw_security.c b/core/rtw_security.c index 5807521..9e95ff6 100644 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -2133,6 +2133,7 @@ BIP_exit: #ifndef PLATFORM_FREEBSD #if defined(CONFIG_TDLS) /* compress 512-bits */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) static int sha256_compress(struct sha256_state *md, unsigned char *buf) { u32 S[8], W[64], t0, t1; @@ -2179,8 +2180,10 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) md->state[i] = md->state[i] + S[i]; return 0; } +#endif /* Initialize the hash state */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) static void sha256_init(struct sha256_state *md) { md->curlen = 0; @@ -2194,6 +2197,7 @@ static void sha256_init(struct sha256_state *md) md->state[6] = 0x1F83D9ABUL; md->state[7] = 0x5BE0CD19UL; } +#endif /** Process a block of memory though the hash @@ -2202,6 +2206,8 @@ static void sha256_init(struct sha256_state *md) @param inlen The length of the data (octets) @return CRYPT_OK if successful */ + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) static int sha256_process(struct sha256_state *md, unsigned char *in, unsigned long inlen) { @@ -2235,7 +2241,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in, return 0; } - +#endif /** Terminate the hash to get the digest @@ -2243,6 +2249,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in, @param out [out] The destination of the hash (32 bytes) @return CRYPT_OK if successful */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) static int sha256_done(struct sha256_state *md, unsigned char *out) { int i; @@ -2281,6 +2288,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out) return 0; } +#endif /** * sha256_vector - SHA256 hash for data vector @@ -2290,6 +2298,8 @@ static int sha256_done(struct sha256_state *md, unsigned char *out) * @mac: Buffer for the hash * Returns: 0 on success, -1 of failure */ + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len, u8 *mac) { @@ -2304,6 +2314,7 @@ static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len, return -1; return 0; } +#endif static u8 os_strlen(const char *s) { @@ -2344,6 +2355,7 @@ static int os_memcmp(const void *s1, const void *s2, u8 n) * @mac: Buffer for the hash (32 bytes) */ #if defined(CONFIG_TDLS) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem, u8 *addr[], size_t *len, u8 *mac) { @@ -2405,6 +2417,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem, _len[1] = 32; sha256_vector(2, _addr, _len, mac); } +#endif #endif /* CONFIG_TDLS */ #endif /* PLATFORM_FREEBSD */ /** @@ -2422,6 +2435,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem, */ #ifndef PLATFORM_FREEBSD /* Baron */ #if defined(CONFIG_TDLS) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) static void sha256_prf(u8 *key, size_t key_len, char *label, u8 *data, size_t data_len, u8 *buf, size_t buf_len) { @@ -2459,6 +2473,7 @@ static void sha256_prf(u8 *key, size_t key_len, char *label, } } #endif +#endif #endif /* PLATFORM_FREEBSD Baron */ /* AES tables*/ diff --git a/include/rtw_security.h b/include/rtw_security.h index ac8432e..6e40499 100644 --- a/include/rtw_security.h +++ b/include/rtw_security.h @@ -249,11 +249,13 @@ struct security_priv { #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) struct sha256_state { u64 length; u32 state[8], curlen; u8 buf[64]; }; +#endif #define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\ do {\ diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 3acf030..383a557 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -686,18 +686,12 @@ static int rtw_cfg80211_sync_iftype(_adapter *adapter) static u64 rtw_get_systime_us(void) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)) - struct timespec64 ts; -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)) struct timespec ts; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)) - getboottime64(&ts); -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)) - getboottime(&ts); -#else get_monotonic_boottime(&ts); -#endif return ((u64)ts.tv_sec * 1000000) + ts.tv_nsec / 1000; +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)) + return ktime_to_us(ktime_get_boottime()); #else struct timeval tv; do_gettimeofday(&tv); @@ -7094,6 +7088,7 @@ exit: return ret; } +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) struct wireless_dev *wdev, @@ -7101,7 +7096,17 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, struct net_device *ndev, #endif u16 frame_type, bool reg) +#else +static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy, + struct wireless_dev *wdev, + struct mgmt_frame_regs *upd) +#endif + { +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) + u32 rtw_mask = BIT(IEEE80211_STYPE_PROBE_REQ >> 4); +#endif + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) struct net_device *ndev = wdev_to_ndev(wdev); #endif @@ -7116,13 +7121,18 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, pwdev_priv = adapter_wdev_data(adapter); #ifdef CONFIG_DEBUG_CFG80211 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) RTW_INFO(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter), frame_type, reg); +#else + RTW_INFO(FUNC_ADPT_FMT " old_regs:%x new_regs:%x\n", + FUNC_ADPT_ARG(adapter), pwdev_priv->mgmt_mask, upd->interface_stypes); +#endif #endif /* Wait QC Verify */ return; - +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) switch (frame_type) { case IEEE80211_STYPE_PROBE_REQ: /* 0x0040 */ SET_CFG80211_REPORT_MGMT(pwdev_priv, IEEE80211_STYPE_PROBE_REQ, reg); @@ -7133,7 +7143,13 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, default: break; } +#else + if ((upd->interface_stypes & rtw_mask) == (pwdev_priv->mgmt_mask & rtw_mask)) + return; + pwdev_priv->mgmt_mask = upd->interface_stypes; +#endif + exit: return; } @@ -9438,7 +9454,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) .mgmt_tx = cfg80211_rtw_mgmt_tx, +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, +#else + .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_register, +#endif #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) .action = cfg80211_rtw_mgmt_tx, #endif diff --git a/os_dep/linux/ioctl_cfg80211.h b/os_dep/linux/ioctl_cfg80211.h index 14684a4..d99844f 100644 --- a/os_dep/linux/ioctl_cfg80211.h +++ b/os_dep/linux/ioctl_cfg80211.h @@ -167,6 +167,10 @@ struct rtw_wdev_priv { bool block; bool block_scan; bool power_mgmt; + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0) + u32 mgmt_mask; + #endif /* report mgmt_frame registered */ u16 report_mgmt;