Skip to content

Commit

Permalink
mac80211: Fix potential null pointer dereferencing
Browse files Browse the repository at this point in the history
The patch "{nl,cfg,mac}80211: Implement RSSI threshold for mesh peering"
has a potential null pointer dereferencing problem. Thanks to Dan Carpenter
for pointing out. This patch will fix the issue.

Signed-off-by: Ashok Nagarajan <ashok@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Ashok Nagarajan authored and John W. Linville committed Mar 7, 2012
1 parent 2ef1675 commit 3d4f969
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions net/mac80211/mesh_plink.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@
#define dot11MeshHoldingTimeout(s) (s->u.mesh.mshcfg.dot11MeshHoldingTimeout)
#define dot11MeshMaxPeerLinks(s) (s->u.mesh.mshcfg.dot11MeshMaxPeerLinks)

#define sta_meets_rssi_threshold(sta, sdata) \
/* We only need a valid sta if user configured a minimum rssi_threshold. */
#define rssi_threshold_check(sta, sdata) \
(sdata->u.mesh.mshcfg.rssi_threshold == 0 ||\
(s8) -ewma_read(&sta->avg_signal) > \
sdata->u.mesh.mshcfg.rssi_threshold)
(sta && (s8) -ewma_read(&sta->avg_signal) > \
sdata->u.mesh.mshcfg.rssi_threshold))

enum plink_event {
PLINK_UNDEFINED,
Expand Down Expand Up @@ -307,7 +308,7 @@ void mesh_neighbour_update(u8 *hw_addr, u32 rates,
sta->plink_state == NL80211_PLINK_LISTEN &&
sdata->u.mesh.accepting_plinks &&
sdata->u.mesh.mshcfg.auto_open_plinks &&
sta_meets_rssi_threshold(sta, sdata))
rssi_threshold_check(sta, sdata))
mesh_plink_open(sta);

rcu_read_unlock();
Expand Down Expand Up @@ -538,9 +539,9 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
}

if (ftype == WLAN_SP_MESH_PEERING_OPEN &&
!sta_meets_rssi_threshold(sta, sdata)) {
!rssi_threshold_check(sta, sdata)) {
mpl_dbg("Mesh plink: %pM does not meet rssi threshold\n",
sta->sta.addr);
mgmt->sa);
rcu_read_unlock();
return;
}
Expand Down

0 comments on commit 3d4f969

Please sign in to comment.