openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: ks7010: move null check before dereference 

Function parameter is cast to a local pointer which is then
dereferenced before it is checked to be non-NULL.

Move pointer null check to be before the pointer is dereferenced.

Signed-off-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tobin C. Harding 2017-04-10 13:15:49 +10:00 committed by Greg Kroah-Hartman
parent dc59ef2af2
commit 9ff19a6e35
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/ks7010/ks_wlan_net.c
View File

@ -1771,6 +1771,8 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
unsigned int commit = 0; unsigned int commit = 0;
enc = (struct iw_encode_ext *)extra; enc = (struct iw_encode_ext *)extra;
if (!enc)
return -EINVAL;
DPRINTK(2, "flags=%04X:: ext_flags=%08X\n", dwrq->flags, DPRINTK(2, "flags=%04X:: ext_flags=%08X\n", dwrq->flags,
enc->ext_flags); enc->ext_flags);
@ -1786,9 +1788,6 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
if (dwrq->flags & IW_ENCODE_DISABLED) if (dwrq->flags & IW_ENCODE_DISABLED)
priv->wpa.key[index].key_len = 0; priv->wpa.key[index].key_len = 0;
if (!enc)
return -EINVAL;
priv->wpa.key[index].ext_flags = enc->ext_flags; priv->wpa.key[index].ext_flags = enc->ext_flags;
if (enc->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) { if (enc->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
priv->wpa.txkey = index; priv->wpa.txkey = index;