* [PATCH] hid: hid-roccat-koneplus: potential NULL dereference
@ 2011-01-17 10:08 ` Vasiliy Kulikov
0 siblings, 0 replies; 4+ messages in thread
From: Vasiliy Kulikov @ 2011-01-17 10:08 UTC (permalink / raw)
To: kernel-janitors; +Cc: Jiri Kosina, linux-input, linux-kernel
kmalloc() may fail, if so return -ENOMEM.
Also koneplus_init_koneplus_device_struct() should check return code
of koneplus_get_startup_profile() and propagate its return code.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
---
Compile tested only.
drivers/hid/hid-roccat-koneplus.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c
index 1608c8d..591a97c 100644
--- a/drivers/hid/hid-roccat-koneplus.c
+++ b/drivers/hid/hid-roccat-koneplus.c
@@ -220,6 +220,8 @@ static int koneplus_get_startup_profile(struct usb_device *usb_dev)
int retval;
buf = kmalloc(sizeof(struct koneplus_startup_profile), GFP_KERNEL);
+ if (buf == NULL)
+ return -ENOMEM;
retval = koneplus_receive(usb_dev, KONEPLUS_USB_COMMAND_STARTUP_PROFILE,
buf, sizeof(struct koneplus_startup_profile));
@@ -614,6 +616,8 @@ static int koneplus_init_koneplus_device_struct(struct usb_device *usb_dev,
mutex_init(&koneplus->koneplus_lock);
koneplus->startup_profile = koneplus_get_startup_profile(usb_dev);
+ if (koneplus->startup_profile < 0)
+ return koneplus->startup_profile;
msleep(wait);
retval = koneplus_get_info(usb_dev, &koneplus->info);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] hid: hid-roccat-koneplus: potential NULL dereference
@ 2011-01-17 10:08 ` Vasiliy Kulikov
0 siblings, 0 replies; 4+ messages in thread
From: Vasiliy Kulikov @ 2011-01-17 10:08 UTC (permalink / raw)
To: kernel-janitors; +Cc: Jiri Kosina, linux-input, linux-kernel
kmalloc() may fail, if so return -ENOMEM.
Also koneplus_init_koneplus_device_struct() should check return code
of koneplus_get_startup_profile() and propagate its return code.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
---
Compile tested only.
drivers/hid/hid-roccat-koneplus.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c
index 1608c8d..591a97c 100644
--- a/drivers/hid/hid-roccat-koneplus.c
+++ b/drivers/hid/hid-roccat-koneplus.c
@@ -220,6 +220,8 @@ static int koneplus_get_startup_profile(struct usb_device *usb_dev)
int retval;
buf = kmalloc(sizeof(struct koneplus_startup_profile), GFP_KERNEL);
+ if (buf = NULL)
+ return -ENOMEM;
retval = koneplus_receive(usb_dev, KONEPLUS_USB_COMMAND_STARTUP_PROFILE,
buf, sizeof(struct koneplus_startup_profile));
@@ -614,6 +616,8 @@ static int koneplus_init_koneplus_device_struct(struct usb_device *usb_dev,
mutex_init(&koneplus->koneplus_lock);
koneplus->startup_profile = koneplus_get_startup_profile(usb_dev);
+ if (koneplus->startup_profile < 0)
+ return koneplus->startup_profile;
msleep(wait);
retval = koneplus_get_info(usb_dev, &koneplus->info);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] hid: hid-roccat-koneplus: potential NULL dereference
2011-01-17 10:08 ` Vasiliy Kulikov
@ 2011-01-17 12:21 ` Jiri Kosina
-1 siblings, 0 replies; 4+ messages in thread
From: Jiri Kosina @ 2011-01-17 12:21 UTC (permalink / raw)
To: Vasiliy Kulikov; +Cc: kernel-janitors, linux-input, linux-kernel
On Mon, 17 Jan 2011, Vasiliy Kulikov wrote:
> kmalloc() may fail, if so return -ENOMEM.
> Also koneplus_init_koneplus_device_struct() should check return code
> of koneplus_get_startup_profile() and propagate its return code.
>
> Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Applied, thanks Vasiliy.
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] hid: hid-roccat-koneplus: potential NULL dereference
@ 2011-01-17 12:21 ` Jiri Kosina
0 siblings, 0 replies; 4+ messages in thread
From: Jiri Kosina @ 2011-01-17 12:21 UTC (permalink / raw)
To: Vasiliy Kulikov; +Cc: kernel-janitors, linux-input, linux-kernel
On Mon, 17 Jan 2011, Vasiliy Kulikov wrote:
> kmalloc() may fail, if so return -ENOMEM.
> Also koneplus_init_koneplus_device_struct() should check return code
> of koneplus_get_startup_profile() and propagate its return code.
>
> Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Applied, thanks Vasiliy.
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-01-17 12:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-17 10:08 [PATCH] hid: hid-roccat-koneplus: potential NULL dereference Vasiliy Kulikov
2011-01-17 10:08 ` Vasiliy Kulikov
2011-01-17 12:21 ` Jiri Kosina
2011-01-17 12:21 ` Jiri Kosina
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.