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

Commit 9ff19a6e authored by Tobin C. Harding's avatar Tobin C. Harding Committed by Greg Kroah-Hartman
Browse files

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: default avatarTobin C. Harding <me@tobin.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc59ef2a

drivers/staging/ks7010/ks_wlan_net.c

+2 −3
Original line number Diff line number Diff line
@@ -1771,6 +1771,8 @@ static int ks_wlan_set_encode_ext(struct net_device *dev, 
	unsigned int commit = 0;



	enc = (struct iw_encode_ext *)extra;

	if (!enc)

		return -EINVAL;



	DPRINTK(2, "flags=%04X:: ext_flags=%08X\n", dwrq->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)

		priv->wpa.key[index].key_len = 0;



	if (!enc)

		return -EINVAL;



	priv->wpa.key[index].ext_flags = enc->ext_flags;

	if (enc->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {

		priv->wpa.txkey = index;