aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/wusbcore/dev-sysfs.c2
-rw-r--r--drivers/usb/wusbcore/security.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/wusbcore/dev-sysfs.c b/drivers/usb/wusbcore/dev-sysfs.c
index 101834576236..415b14002a61 100644
--- a/drivers/usb/wusbcore/dev-sysfs.c
+++ b/drivers/usb/wusbcore/dev-sysfs.c
@@ -101,7 +101,7 @@ static ssize_t wusb_ck_store(struct device *dev,
101 if (wusbhc == NULL) 101 if (wusbhc == NULL)
102 return -ENODEV; 102 return -ENODEV;
103 result = wusb_dev_4way_handshake(wusbhc, usb_dev->wusb_dev, &ck); 103 result = wusb_dev_4way_handshake(wusbhc, usb_dev->wusb_dev, &ck);
104 memset(&ck, 0, sizeof(ck)); 104 memzero_explicit(&ck, sizeof(ck));
105 wusbhc_put(wusbhc); 105 wusbhc_put(wusbhc);
106 return result < 0 ? result : size; 106 return result < 0 ? result : size;
107} 107}
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index cc74d669c802..b66faaf3e842 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -522,10 +522,10 @@ error_hs3:
522error_hs2: 522error_hs2:
523error_hs1: 523error_hs1:
524 memset(hs, 0, 3*sizeof(hs[0])); 524 memset(hs, 0, 3*sizeof(hs[0]));
525 memset(&keydvt_out, 0, sizeof(keydvt_out)); 525 memzero_explicit(&keydvt_out, sizeof(keydvt_out));
526 memset(&keydvt_in, 0, sizeof(keydvt_in)); 526 memzero_explicit(&keydvt_in, sizeof(keydvt_in));
527 memset(&ccm_n, 0, sizeof(ccm_n)); 527 memzero_explicit(&ccm_n, sizeof(ccm_n));
528 memset(mic, 0, sizeof(mic)); 528 memzero_explicit(mic, sizeof(mic));
529 if (result < 0) 529 if (result < 0)
530 wusb_dev_set_encryption(usb_dev, 0); 530 wusb_dev_set_encryption(usb_dev, 0);
531error_dev_set_encryption: 531error_dev_set_encryption: