97bc59a5c0
Refresh all patches. The removed patches were integrated upstream. This contains fixes for CVE-2020-3702 1. These patches (ath, ath9k, mac80211) were included in kernel versions since 4.14.245 and 4.19.205. They fix security vulnerability CVE-2020-3702 [1] similar to KrØØk, which was found by ESET [2]. Thank you Josef Schlehofer for reporting this problem. [1] https://nvd.nist.gov/vuln/detail/CVE-2020-3702 [2] https://www.welivesecurity.com/2020/08/06/beyond-kr00k-even-more-wifi-chips-vulnerable-eavesdropping/ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
31 lines
891 B
Diff
31 lines
891 B
Diff
--- a/drivers/net/wireless/ath/Makefile
|
|
+++ b/drivers/net/wireless/ath/Makefile
|
|
@@ -15,10 +15,10 @@ ath-objs := main.o \
|
|
regd.o \
|
|
hw.o \
|
|
key.o \
|
|
+ debug.o \
|
|
dfs_pattern_detector.o \
|
|
dfs_pri_detector.o
|
|
|
|
-ath-$(CPTCFG_ATH_DEBUG) += debug.o
|
|
ath-$(CPTCFG_ATH_TRACEPOINTS) += trace.o
|
|
|
|
CFLAGS_trace.o := -I$(src)
|
|
--- a/drivers/net/wireless/ath/ath.h
|
|
+++ b/drivers/net/wireless/ath/ath.h
|
|
@@ -317,14 +317,7 @@ void _ath_dbg(struct ath_common *common,
|
|
#endif /* CPTCFG_ATH_DEBUG */
|
|
|
|
/** Returns string describing opmode, or NULL if unknown mode. */
|
|
-#ifdef CPTCFG_ATH_DEBUG
|
|
const char *ath_opmode_to_string(enum nl80211_iftype opmode);
|
|
-#else
|
|
-static inline const char *ath_opmode_to_string(enum nl80211_iftype opmode)
|
|
-{
|
|
- return "UNKNOWN";
|
|
-}
|
|
-#endif
|
|
|
|
extern const char *ath_bus_type_strings[];
|
|
static inline const char *ath_bus_type_to_string(enum ath_bus_type bustype)
|