Skip to content

Commit

Permalink
mac80211: mesh: fix potentially unaligned access
Browse files Browse the repository at this point in the history
[ Upstream commit b973106 ]

The pointer here points directly into the frame, so the
access is potentially unaligned. Use get_unaligned_le16
to avoid that.

Fixes: 3f52b7e ("mac80211: mesh power save basics")
Link: https://lore.kernel.org/r/20210920154009.3110ff75be0c.Ib6a2ff9e9cc9bc6fca50fce631ec1ce725cc926b@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
jmberg-intel authored and gregkh committed Oct 7, 2021
1 parent 997ee23 commit 35367a5
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion net/mac80211/mesh_ps.c
Expand Up @@ -2,6 +2,7 @@
/*
* Copyright 2012-2013, Marco Porsch <marco.porsch@s2005.tu-chemnitz.de>
* Copyright 2012-2013, cozybit Inc.
* Copyright (C) 2021 Intel Corporation
*/

#include "mesh.h"
Expand Down Expand Up @@ -588,7 +589,7 @@ void ieee80211_mps_frame_release(struct sta_info *sta,

/* only transmit to PS STA with announced, non-zero awake window */
if (test_sta_flag(sta, WLAN_STA_PS_STA) &&
(!elems->awake_window || !le16_to_cpu(*elems->awake_window)))
(!elems->awake_window || !get_unaligned_le16(elems->awake_window)))
return;

if (!test_sta_flag(sta, WLAN_STA_MPSP_OWNER))
Expand Down

0 comments on commit 35367a5

Please sign in to comment.