| Message ID | 1465405668-15881-2-git-send-email-qca_merez@qca.qualcomm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9c830abe9194871d6d2846f37930ef373356a016 |
| Delegated to: | Kalle Valo |
| Headers | show |
Maya Erez <qca_merez@qualcomm.com> wrote: > In wil_p2p_listen chan is checked to protect against NULL > pointer access only before setting channel = chan->hw_value. > Add a global parameter check to cover all accesses to chan. > > Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com> Thanks, 2 patches applied to ath-next branch of ath.git: 9c830abe9194 wil6210: fix chan check in wil_p2p_listen eb57a5b387d6 wil6210: abort P2P search when stopping P2P device
diff --git a/drivers/net/wireless/ath/wil6210/p2p.c b/drivers/net/wireless/ath/wil6210/p2p.c index 1c91538..213b825 100644 --- a/drivers/net/wireless/ath/wil6210/p2p.c +++ b/drivers/net/wireless/ath/wil6210/p2p.c @@ -114,8 +114,10 @@ int wil_p2p_listen(struct wil6210_priv *wil, unsigned int duration, u8 channel = P2P_DMG_SOCIAL_CHANNEL; int rc; - if (chan) - channel = chan->hw_value; + if (!chan) + return -EINVAL; + + channel = chan->hw_value; wil_dbg_misc(wil, "%s: duration %d\n", __func__, duration);
In wil_p2p_listen chan is checked to protect against NULL pointer access only before setting channel = chan->hw_value. Add a global parameter check to cover all accesses to chan. Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com> --- drivers/net/wireless/ath/wil6210/p2p.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)