diff options
| author | Colin Ian King <colin.king@canonical.com> | 2013-03-26 13:35:23 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-27 11:07:05 -0400 |
| commit | ace5af39866da7d45f43774150dace19a73716d6 (patch) | |
| tree | ecf729c4259b96a37fa3b98024076e76e9f88ab8 /drivers | |
| parent | 7fc0357479eeff4ca808c4d8c09bc7631f576b8d (diff) | |
iwlegacy: 4965-rs: avoid null pointer dereference error
il4965_rs_initialize_lq checks to see if sta is null, however, before that
check il4965_rs_use_green dereferences sta when intializing use_green.
Avoid a potential null pointer dereference error by only calling
il4965_rs_use_green after we are sure sta is not null.
Smatch analysis:
drivers/net/wireless/iwlegacy/4965-rs.c:2160 il4965_rs_initialize_lq() warn:
variable dereferenced before check 'sta' (see line 2155)
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-rs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c index e8324b5e5bfe..6c7493c2d698 100644 --- a/drivers/net/wireless/iwlegacy/4965-rs.c +++ b/drivers/net/wireless/iwlegacy/4965-rs.c | |||
| @@ -2152,7 +2152,7 @@ il4965_rs_initialize_lq(struct il_priv *il, struct ieee80211_conf *conf, | |||
| 2152 | int rate_idx; | 2152 | int rate_idx; |
| 2153 | int i; | 2153 | int i; |
| 2154 | u32 rate; | 2154 | u32 rate; |
| 2155 | u8 use_green = il4965_rs_use_green(il, sta); | 2155 | u8 use_green; |
| 2156 | u8 active_tbl = 0; | 2156 | u8 active_tbl = 0; |
| 2157 | u8 valid_tx_ant; | 2157 | u8 valid_tx_ant; |
| 2158 | struct il_station_priv *sta_priv; | 2158 | struct il_station_priv *sta_priv; |
| @@ -2160,6 +2160,7 @@ il4965_rs_initialize_lq(struct il_priv *il, struct ieee80211_conf *conf, | |||
| 2160 | if (!sta || !lq_sta) | 2160 | if (!sta || !lq_sta) |
| 2161 | return; | 2161 | return; |
| 2162 | 2162 | ||
| 2163 | use_green = il4965_rs_use_green(il, sta); | ||
| 2163 | sta_priv = (void *)sta->drv_priv; | 2164 | sta_priv = (void *)sta->drv_priv; |
| 2164 | 2165 | ||
| 2165 | i = lq_sta->last_txrate_idx; | 2166 | i = lq_sta->last_txrate_idx; |