diff options
| author | Jiasheng Jiang <jiasheng@iscas.ac.cn> | 2022-03-01 18:00:20 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-03-08 19:04:09 +0100 |
| commit | 19e164396ba9f1f11e35cfc575c07b23a83ee5b9 (patch) | |
| tree | 7273f39b81ba2a95002326ddf2496f5230c9eeb8 | |
| parent | cc437a0a5b00d36e0258221843893d44efdf4afe (diff) | |
| download | linux-stable-19e164396ba9f1f11e35cfc575c07b23a83ee5b9.tar.gz linux-stable-19e164396ba9f1f11e35cfc575c07b23a83ee5b9.tar.bz2 linux-stable-19e164396ba9f1f11e35cfc575c07b23a83ee5b9.zip | |
nl80211: Handle nla_memdup failures in handle_nan_filter
[ Upstream commit 6ad27f522cb3b210476daf63ce6ddb6568c0508b ]
As there's potential for failure of the nla_memdup(),
check the return value.
Fixes: a442b761b24b ("cfg80211: add add_nan_func / del_nan_func")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20220301100020.3801187-1-jiasheng@iscas.ac.cn
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/wireless/nl80211.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 04c4fd376e1d..c5806f46f6c9 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -11791,6 +11791,9 @@ static int handle_nan_filter(struct nlattr *attr_filter, i = 0; nla_for_each_nested(attr, attr_filter, rem) { filter[i].filter = nla_memdup(attr, GFP_KERNEL); + if (!filter[i].filter) + goto err; + filter[i].len = nla_len(attr); i++; } @@ -11803,6 +11806,15 @@ static int handle_nan_filter(struct nlattr *attr_filter, } return 0; + +err: + i = 0; + nla_for_each_nested(attr, attr_filter, rem) { + kfree(filter[i].filter); + i++; + } + kfree(filter); + return -ENOMEM; } static int nl80211_nan_add_func(struct sk_buff *skb, |