From bdcc78d3eab64c7017af3ace8c78e3279d53a07a Mon Sep 17 00:00:00 2001 From: Bapiraju Alla Date: Tue, 10 Mar 2020 11:42:41 +0530 Subject: [PATCH] qcacmn: Remove dummy NLA parsing in driver for kernel >= 5.2 Existing dummy NLA parsers are triggering illegal memory access with kernel versions 5.2 or later. To resolve this, revert the change Iea1fdcac3000ede2f8b9398cb85443e545cdd3f0 (Add dummy NLA parsing in driver for kernel >= 5.2). Change-Id: I8804d5aefefec248a1b82d1ca92ffaab56aa539f CRs-Fixed: 2638303 --- os_if/linux/wlan_cfg80211.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/os_if/linux/wlan_cfg80211.h b/os_if/linux/wlan_cfg80211.h index c7c8ed4c0be2..b35bb092622f 100644 --- a/os_if/linux/wlan_cfg80211.h +++ b/os_if/linux/wlan_cfg80211.h @@ -178,7 +178,7 @@ wlan_cfg80211_nla_parse_nested(struct nlattr *tb[], { return nla_parse_nested(tb, maxtype, nla, policy); } -#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) +#else static inline int wlan_cfg80211_nla_parse(struct nlattr **tb, int maxtype, const struct nlattr *head, @@ -196,24 +196,6 @@ wlan_cfg80211_nla_parse_nested(struct nlattr *tb[], { return nla_parse_nested(tb, maxtype, nla, policy, NULL); } -#else -static inline int wlan_cfg80211_nla_parse(struct nlattr **tb, - int maxtype, - const struct nlattr *head, - int len, - const struct nla_policy *policy) -{ - return 0; -} - -static inline int -wlan_cfg80211_nla_parse_nested(struct nlattr *tb[], - int maxtype, - const struct nlattr *nla, - const struct nla_policy *policy) -{ - return 0; -} #endif #define nla_parse(...) (obsolete, use wlan_cfg80211_nla_parse) #define nla_parse_nested(...) (obsolete, use wlan_cfg80211_nla_parse_nested)