| Message ID | 20160411074438.GA15227@mwanda (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
On 11 April 2016 at 09:44, Dan Carpenter <dan.carpenter@oracle.com> wrote: > Smatch complains that since "ev->peer_id" comes from skb->data that > means we can't trust it and have to do a bounds check on it to prevent > an array overflow. > > Fixes: 6942726f7f7b ('ath10k: add fast peer_map lookup') > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c > index 9369411..fd6ba69 100644 > --- a/drivers/net/wireless/ath/ath10k/txrx.c > +++ b/drivers/net/wireless/ath/ath10k/txrx.c > @@ -190,6 +190,9 @@ void ath10k_peer_map_event(struct ath10k_htt *htt, > struct ath10k *ar = htt->ar; > struct ath10k_peer *peer; > > + if (ev->peer_id >= ATH10K_MAX_NUM_PEER_IDS) > + return; > + This will lead to a timeout in the other part of the code so printing a warning here will make it easier to understand the failure, e.g. ath10k_warn(ar, "received htt peer map event with idx out of bounds: %hu\n", ev->peer_id); > spin_lock_bh(&ar->data_lock); > peer = ath10k_peer_find(ar, ev->vdev_id, ev->addr); > if (!peer) { > @@ -218,6 +221,9 @@ void ath10k_peer_unmap_event(struct ath10k_htt *htt, > struct ath10k *ar = htt->ar; > struct ath10k_peer *peer; > > + if (ev->peer_id >= ATH10K_MAX_NUM_PEER_IDS) > + return; Ditto but s/map/unmap. Anyway, good catch, thanks! Micha? -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c index 9369411..fd6ba69 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -190,6 +190,9 @@ void ath10k_peer_map_event(struct ath10k_htt *htt, struct ath10k *ar = htt->ar; struct ath10k_peer *peer; + if (ev->peer_id >= ATH10K_MAX_NUM_PEER_IDS) + return; + spin_lock_bh(&ar->data_lock); peer = ath10k_peer_find(ar, ev->vdev_id, ev->addr); if (!peer) { @@ -218,6 +221,9 @@ void ath10k_peer_unmap_event(struct ath10k_htt *htt, struct ath10k *ar = htt->ar; struct ath10k_peer *peer; + if (ev->peer_id >= ATH10K_MAX_NUM_PEER_IDS) + return; + spin_lock_bh(&ar->data_lock); peer = ath10k_peer_find_by_id(ar, ev->peer_id); if (!peer) {
Smatch complains that since "ev->peer_id" comes from skb->data that means we can't trust it and have to do a bounds check on it to prevent an array overflow. Fixes: 6942726f7f7b ('ath10k: add fast peer_map lookup') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html