Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3f868a4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: verify cid value is valid"

parents d740d45d bf643dcb

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static inline void parse_cidxtid(u8 cidxtid, u8 *cid, u8 *tid) 
 * wil_cid_valid - check cid is valid

 * @cid: CID value

 */

static inline bool wil_cid_valid(u8 cid)

static inline bool wil_cid_valid(int cid)

{

	return (cid >= 0 && cid < max_assoc_sta);

}

drivers/net/wireless/ath/wil6210/wmi.c

+6 −0
Original line number Diff line number Diff line
@@ -1358,6 +1358,12 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock) 
		cid = evt->cid;

		tid = evt->tid;

	}



	if (!wil_cid_valid(cid)) {

		wil_err(wil, "DELBA: Invalid CID %d\n", cid);

		return;

	}



	wil_dbg_wmi(wil, "DELBA MID %d CID %d TID %d from %s reason %d\n",

		    vif->mid, cid, tid,

		    evt->from_initiator ? "originator" : "recipient",