From: Tobin C. Harding Date: Mon, 10 Apr 2017 03:15:49 +0000 (+1000) Subject: staging: ks7010: move null check before dereference X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9ff19a6e35ab460c07dc40c563b57b0ad866e2e9;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index 89fcd23e8f94..eb3573e5365d 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -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;