Skip to content

Commit

Permalink
USB: use kzfree()
Browse files Browse the repository at this point in the history
Use kzfree() instead of memset() + kfree().

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Johannes Weiner authored and Greg Kroah-Hartman committed Mar 24, 2009
1 parent d34d972 commit 31dbb80
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions drivers/usb/host/hwa-hc.c
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,7 @@ static int __hwahc_dev_set_key(struct wusbhc *wusbhc, u8 port_idx, u32 tkid,
port_idx << 8 | iface_no,
keyd, keyd_len, 1000 /* FIXME: arbitrary */);

memset(keyd, 0, sizeof(*keyd)); /* clear keys etc. */
kfree(keyd);
kzfree(keyd); /* clear keys etc. */
return result;
}

Expand Down
3 changes: 1 addition & 2 deletions drivers/usb/wusbcore/cbaf.c
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,7 @@ static void cbaf_disconnect(struct usb_interface *iface)
usb_put_intf(iface);
kfree(cbaf->buffer);
/* paranoia: clean up crypto keys */
memset(cbaf, 0, sizeof(*cbaf));
kfree(cbaf);
kzfree(cbaf);
}

static struct usb_device_id cbaf_id_table[] = {
Expand Down

0 comments on commit 31dbb80

Please sign in to comment.