* [patch 2/2] staging: ks7010: remove bogus NULL checks
@ 2016-06-14 11:17 Dan Carpenter
0 siblings, 0 replies; only message in thread
From: Dan Carpenter @ 2016-06-14 11:17 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Wolfram Sang, devel, linux-kernel, kernel-janitors
enc->rx_seq[] and enc->key[] are arrays, not pointers and they can't be
NULL. Let's remove these NULL checks.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 8ef0f11..fc93028 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -1910,11 +1910,8 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
priv->wpa.txkey = index;
commit |= SME_WEP_INDEX;
} else if (enc->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
- if (enc->rx_seq)
- memcpy(&priv->wpa.key[index].rx_seq[0],
- enc->rx_seq, IW_ENCODE_SEQ_MAX_SIZE);
- else
- return -EINVAL;
+ memcpy(&priv->wpa.key[index].rx_seq[0],
+ enc->rx_seq, IW_ENCODE_SEQ_MAX_SIZE);
}
memcpy(&priv->wpa.key[index].addr.sa_data[0],
@@ -1935,7 +1932,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
priv->reg.privacy_invoked = 0x01;
commit |= SME_WEP_FLAG;
}
- if (enc->key && enc->key_len) {
+ if (enc->key_len) {
memcpy(&priv->wpa.key[index].key_val[0],
&enc->key[0], enc->key_len);
priv->wpa.key[index].key_len = enc->key_len;
@@ -1947,7 +1944,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
priv->reg.privacy_invoked = 0x01;
commit |= SME_WEP_FLAG;
}
- if (enc->key && enc->key_len == 32) {
+ if (enc->key_len == 32) {
memcpy(&priv->wpa.key[index].key_val[0],
&enc->key[0], enc->key_len - 16);
priv->wpa.key[index].key_len =
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-06-14 11:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-14 11:17 [patch 2/2] staging: ks7010: remove bogus NULL checks Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).