* [PATCH] drivers/media/video/se401.c: check kmalloc() return value.
@ 2007-03-09 7:30 Amit Choudhary
2007-03-09 8:31 ` Oliver Neukum
0 siblings, 1 reply; 4+ messages in thread
From: Amit Choudhary @ 2007-03-09 7:30 UTC (permalink / raw)
To: Linux Kernel
Description: Check the return value of kmalloc() in function se401_start_stream(), in file drivers/media/video/se401.c.
Signed-off-by: Amit Choudhary <amit2030@gmail.com>
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index 7aeec57..006c818 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -450,6 +450,13 @@ static int se401_start_stream(struct usb
}
for (i=0; i<SE401_NUMSBUF; i++) {
se401->sbuf[i].data=kmalloc(SE401_PACKETSIZE, GFP_KERNEL);
+ if (!se401->sbuf[i].data) {
+ for(i = i - 1; i >= 0; i--) {
+ kfree(se401->sbuf[i].data);
+ se401->sbuf[i].data = NULL;
+ }
+ return -ENOMEM;
+ }
}
se401->bayeroffset=0;
@@ -458,13 +465,26 @@ static int se401_start_stream(struct usb
se401->scratch_overflow=0;
for (i=0; i<SE401_NUMSCRATCH; i++) {
se401->scratch[i].data=kmalloc(SE401_PACKETSIZE, GFP_KERNEL);
+ if (!se401->scratch[i].data) {
+ for(i = i - 1; i >= 0; i--) {
+ kfree(se401->scratch[i].data);
+ se401->scratch[i].data = NULL;
+ }
+ goto nomem_sbuf;
+ }
se401->scratch[i].state=BUFFER_UNUSED;
}
for (i=0; i<SE401_NUMSBUF; i++) {
urb=usb_alloc_urb(0, GFP_KERNEL);
- if(!urb)
- return -ENOMEM;
+ if(!urb) {
+ for(i = i - 1; i >= 0; i--) {
+ usb_kill_urb(se401->urb[i]);
+ usb_free_urb(se401->urb[i]);
+ se401->urb[i] = NULL;
+ }
+ goto nomem_scratch;
+ }
usb_fill_bulk_urb(urb, se401->dev,
usb_rcvbulkpipe(se401->dev, SE401_VIDEO_ENDPOINT),
@@ -482,6 +502,18 @@ static int se401_start_stream(struct usb
se401->framecount=0;
return 0;
+
+ nomem_scratch:
+ for (i=0; i<SE401_NUMSCRATCH; i++) {
+ kfree(se401->scratch[i].data);
+ se401->scratch[i].data = NULL;
+ }
+ nomem_sbuf:
+ for (i=0; i<SE401_NUMSBUF; i++) {
+ kfree(se401->sbuf[i].data);
+ se401->sbuf[i].data = NULL;
+ }
+ return -ENOMEM;
}
static int se401_stop_stream(struct usb_se401 *se401)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drivers/media/video/se401.c: check kmalloc() return value.
2007-03-09 7:30 [PATCH] drivers/media/video/se401.c: check kmalloc() return value Amit Choudhary
@ 2007-03-09 8:31 ` Oliver Neukum
2007-03-10 4:42 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 4+ messages in thread
From: Oliver Neukum @ 2007-03-09 8:31 UTC (permalink / raw)
To: Amit Choudhary; +Cc: Linux Kernel
Am Freitag, 9. März 2007 08:30 schrieb Amit Choudhary:
> Description: Check the return value of kmalloc() in function se401_start_stream(), in file drivers/media/video/se401.c.
Firstly, USB patches to the USB list.
Secondly, you've fixed an oopsable bug, but you also need to check
the return values higher up in the call chain.
Regards
Oliver
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drivers/media/video/se401.c: check kmalloc() return value.
2007-03-09 8:31 ` Oliver Neukum
@ 2007-03-10 4:42 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2007-03-10 4:42 UTC (permalink / raw)
To: Oliver Neukum; +Cc: Amit Choudhary, Linux Kernel
Hi Oliver,
Em Sex, 2007-03-09 às 09:31 +0100, Oliver Neukum escreveu:
> Am Freitag, 9. März 2007 08:30 schrieb Amit Choudhary:
> > Description: Check the return value of kmalloc() in function se401_start_stream(), in file drivers/media/video/se401.c.
>
> Firstly, USB patches to the USB list.
No. In this case, the proper lists for the devices under /drivers/media
is the V4L mailing list (at video4linux-list@redhat.com and
v4l-dvb-maintainer@linuxtv.org), were you will reach the maintainers of
those code (no matter if those devices are USB or not).
Cheers,
Mauro
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] drivers/media/video/se401.c: check kmalloc() return value.
@ 2007-03-11 22:09 Amit Choudhary
0 siblings, 0 replies; 4+ messages in thread
From: Amit Choudhary @ 2007-03-11 22:09 UTC (permalink / raw)
To: Linux Kernel; +Cc: video4linux-list, v4l-dvb-maintainer
Description: Check the return value of kmalloc() in function se401_start_stream(), in file drivers/media/video/se401.c.
Signed-off-by: Amit Choudhary <amit2030@gmail.com>
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index 7aeec57..006c818 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -450,6 +450,13 @@ static int se401_start_stream(struct usb
}
for (i=0; i<SE401_NUMSBUF; i++) {
se401->sbuf[i].data=kmalloc(SE401_PACKETSIZE, GFP_KERNEL);
+ if (!se401->sbuf[i].data) {
+ for(i = i - 1; i >= 0; i--) {
+ kfree(se401->sbuf[i].data);
+ se401->sbuf[i].data = NULL;
+ }
+ return -ENOMEM;
+ }
}
se401->bayeroffset=0;
@@ -458,13 +465,26 @@ static int se401_start_stream(struct usb
se401->scratch_overflow=0;
for (i=0; i<SE401_NUMSCRATCH; i++) {
se401->scratch[i].data=kmalloc(SE401_PACKETSIZE, GFP_KERNEL);
+ if (!se401->scratch[i].data) {
+ for(i = i - 1; i >= 0; i--) {
+ kfree(se401->scratch[i].data);
+ se401->scratch[i].data = NULL;
+ }
+ goto nomem_sbuf;
+ }
se401->scratch[i].state=BUFFER_UNUSED;
}
for (i=0; i<SE401_NUMSBUF; i++) {
urb=usb_alloc_urb(0, GFP_KERNEL);
- if(!urb)
- return -ENOMEM;
+ if(!urb) {
+ for(i = i - 1; i >= 0; i--) {
+ usb_kill_urb(se401->urb[i]);
+ usb_free_urb(se401->urb[i]);
+ se401->urb[i] = NULL;
+ }
+ goto nomem_scratch;
+ }
usb_fill_bulk_urb(urb, se401->dev,
usb_rcvbulkpipe(se401->dev, SE401_VIDEO_ENDPOINT),
@@ -482,6 +502,18 @@ static int se401_start_stream(struct usb
se401->framecount=0;
return 0;
+
+ nomem_scratch:
+ for (i=0; i<SE401_NUMSCRATCH; i++) {
+ kfree(se401->scratch[i].data);
+ se401->scratch[i].data = NULL;
+ }
+ nomem_sbuf:
+ for (i=0; i<SE401_NUMSBUF; i++) {
+ kfree(se401->sbuf[i].data);
+ se401->sbuf[i].data = NULL;
+ }
+ return -ENOMEM;
}
static int se401_stop_stream(struct usb_se401 *se401)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-03-11 22:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-09 7:30 [PATCH] drivers/media/video/se401.c: check kmalloc() return value Amit Choudhary
2007-03-09 8:31 ` Oliver Neukum
2007-03-10 4:42 ` Mauro Carvalho Chehab
-- strict thread matches above, loose matches on Subject: below --
2007-03-11 22:09 Amit Choudhary
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox