OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21c4129
)
staging: gigaset: fix illegal free on probe errors
author
Johan Hovold
<johan@kernel.org>
Mon, 2 Dec 2019 08:56:09 +0000
(09:56 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sat, 21 Dec 2019 09:35:10 +0000
(10:35 +0100)
commit
84f60ca7b326ed8c08582417493982fe2573a9ad
upstream.
The driver failed to initialise its receive-buffer pointer, something
which could lead to an illegal free on late probe errors.
Fix this by making sure to clear all driver data at allocation.
Fixes:
2032e2c2309d
("usb_gigaset: code cleanup")
Cc: stable <stable@vger.kernel.org> # 2.6.33
Cc: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link:
https://lore.kernel.org/r/20191202085610.12719-3-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/isdn/gigaset/usb-gigaset.c
patch
|
blob
|
history
diff --git
a/drivers/isdn/gigaset/usb-gigaset.c
b/drivers/isdn/gigaset/usb-gigaset.c
index
20591f6
..
42e825d
100644
(file)
--- a/
drivers/isdn/gigaset/usb-gigaset.c
+++ b/
drivers/isdn/gigaset/usb-gigaset.c
@@
-574,8
+574,7
@@
static int gigaset_initcshw(struct cardstate *cs)
{
struct usb_cardstate *ucs;
- cs->hw.usb = ucs =
- kmalloc(sizeof(struct usb_cardstate), GFP_KERNEL);
+ cs->hw.usb = ucs = kzalloc(sizeof(struct usb_cardstate), GFP_KERNEL);
if (!ucs) {
pr_err("out of memory\n");
return -ENOMEM;
@@
-587,9
+586,6
@@
static int gigaset_initcshw(struct cardstate *cs)
ucs->bchars[3] = 0;
ucs->bchars[4] = 0x11;
ucs->bchars[5] = 0x13;
- ucs->bulk_out_buffer = NULL;
- ucs->bulk_out_urb = NULL;
- ucs->read_urb = NULL;
tasklet_init(&cs->write_tasklet,
gigaset_modem_fill, (unsigned long) cs);