From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Jiasheng Jiang <jiasheng@iscas.ac.cn>,
Johannes Berg <johannes.berg@intel.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.14 37/42] nl80211: Handle nla_memdup failures in handle_nan_filter
Date: Mon, 7 Mar 2022 10:19:11 +0100 [thread overview]
Message-ID: <20220307091637.232978926@linuxfoundation.org> (raw)
In-Reply-To: <20220307091636.146155347@linuxfoundation.org>
From: Jiasheng Jiang <jiasheng@iscas.ac.cn>
[ 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>
---
net/wireless/nl80211.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f630fa2e3164..bbc3c876a5d8 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -11257,6 +11257,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++;
}
@@ -11269,6 +11272,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,
--
2.34.1
next prev parent reply other threads:[~2022-03-07 9:24 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-07 9:18 [PATCH 4.14 00/42] 4.14.270-rc1 review Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 01/42] mac80211_hwsim: report NOACK frames in tx_status Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 02/42] mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 03/42] i2c: bcm2835: Avoid clock stretching timeouts Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 04/42] Input: clear BTN_RIGHT/MIDDLE on buttonpads Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 05/42] cifs: fix double free race when mount fails in cifs_get_root() Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 06/42] dmaengine: shdma: Fix runtime PM imbalance on error Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 07/42] i2c: cadence: allow COMPILE_TEST Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 08/42] i2c: qup: " Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 09/42] net: usb: cdc_mbim: avoid altsetting toggling for Telit FN990 Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 10/42] usb: gadget: dont release an existing dev->buf Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 11/42] usb: gadget: clear related members when goto fail Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 12/42] ata: pata_hpt37x: fix PCI clock detection Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 13/42] ALSA: intel_hdmi: Fix reference to PCM buffer address Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 14/42] ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 15/42] xfrm: fix MTU regression Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 16/42] netfilter: fix use-after-free in __nf_register_net_hook() Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 17/42] xfrm: enforce validity of offload input flags Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 18/42] netfilter: nf_queue: dont assume sk is full socket Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 19/42] netfilter: nf_queue: fix possible use-after-free Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 20/42] batman-adv: Request iflink once in batadv-on-batadv check Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 21/42] batman-adv: Request iflink once in batadv_get_real_netdevice Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 22/42] batman-adv: Dont expect inter-netns unique iflink indices Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 23/42] net: dcb: flush lingering app table entries for unregistered devices Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 24/42] net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error generated by client Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.14 25/42] net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error cause by server Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 26/42] firmware: Fix a reference count leak Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 27/42] firmware: qemu_fw_cfg: fix kobject leak in probe error path Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 28/42] mac80211: fix forwarded mesh frames AC & queue selection Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 29/42] net: stmmac: fix return value of __setup handler Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 30/42] net: sxgbe: " Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 31/42] net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe() Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 32/42] efivars: Respect "block" flag in efivar_entry_set_safe() Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 33/42] can: gs_usb: change active_channelss type from atomic_t to u8 Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 34/42] ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 35/42] soc: fsl: qe: Check of ioremap return value Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 36/42] net: chelsio: cxgb3: check the return value of pci_find_capability() Greg Kroah-Hartman
2022-03-07 9:19 ` Greg Kroah-Hartman [this message]
2022-03-07 9:19 ` [PATCH 4.14 38/42] Input: elan_i2c - move regulator_[en|dis]able() out of elan_[en|dis]able_power() Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 39/42] Input: elan_i2c - fix regulator enable count imbalance after suspend/resume Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 40/42] HID: add mapping for KEY_ALL_APPLICATIONS Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 41/42] memfd: fix F_SEAL_WRITE after shmem huge page allocated Greg Kroah-Hartman
2022-03-07 9:19 ` [PATCH 4.14 42/42] net: dcb: disable softirqs in dcbnl_flush_dev() Greg Kroah-Hartman
2022-03-08 17:17 ` [PATCH 4.14 00/42] 4.14.270-rc1 review Naresh Kamboju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220307091637.232978926@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=jiasheng@iscas.ac.cn \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox