wifi: mac80211: mesh: check element parsing succeeded

[ 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>

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index a1e526419e9d25ba4e95b53edbfdc94217e09851..5c8a3ff0ae0cc3395d3bb685f886f21cd84d912d 100644 (file)
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -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);
+       }
 }