wifi: mac80211: mesh: check element parsing succeeded
authorJohannes Berg <johannes.berg@intel.com>
Mon, 11 Dec 2023 07:05:32 +0000 (09:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jan 2024 12:42:27 +0000 (12:42 +0000)
[ Upstream commit 1fc4a3eec50d726f4663ad3c0bb0158354d6647a ]

ieee802_11_parse_elems() can return NULL, so we must
check for the return value.

Fixes: 5d24828d05f3 ("mac80211: always allocate struct ieee802_11_elems")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20231211085121.93dea364f3d3.Ie87781c6c48979fb25a744b90af4a33dc2d83a28@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/mesh_plink.c

index a1e5264..5c8a3ff 100644 (file)
@@ -1243,6 +1243,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata,
                        return;
        }
        elems = ieee802_11_parse_elems(baseaddr, len - baselen, true, NULL);
-       mesh_process_plink_frame(sdata, mgmt, elems, rx_status);
-       kfree(elems);
+       if (elems) {
+               mesh_process_plink_frame(sdata, mgmt, elems, rx_status);
+               kfree(elems);
+       }
 }