Skip to contentSkip to conversation

drivers/media/video/se401.c: check kmalloc() return value.

PATCH In review Amit Choudhary 2 participants 2 messages Oct 18, 2006 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/media/video/se401.c: check kmalloc() return value.

Description: Check the return value of kmalloc() in function se401_start_stream(), in file drivers/media/video/se401.c.

drivers/media/video/se401.c +19 -1
index 7aeec57..fe94227 100644
@@ -450,6 +450,8 @@ 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)
+			goto nomem_err;
 	}
 
 	se401->bayeroffset=0;
@@ -458,13 +460,15 @@ 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)
+			goto nomem_err;
 		se401->scratch[i].state=BUFFER_UNUSED;
 	}
 
 	for (i=0; i<SE401_NUMSBUF; i++) {
 		urb=usb_alloc_urb(0, GFP_KERNEL);
 		if(!urb)
-			return -ENOMEM;
+			goto nomem_err;
 
 		usb_fill_bulk_urb(urb, se401->dev,
 			usb_rcvbulkpipe(se401->dev, SE401_VIDEO_ENDPOINT),
@@ -482,6 +486,20 @@ static int se401_start_stream(struct usb
 	se401->framecount=0;
 
 	return 0;
+
+ nomem_err:
+	for (i=0; i<SE401_NUMSBUF; i++) {
+		usb_kill_urb(se401->urb[i]);
+		usb_free_urb(se401->urb[i]);
+		se401->urb[i] = NULL;
+		kfree(se401->sbuf[i].data);
+		se401->sbuf[i].data = NULL;
+	}
+	for (i=0; i<SE401_NUMSCRATCH; i++) {
+		kfree(se401->scratch[i].data);
+		se401->scratch[i].data = NULL;
+	}
+	return -ENOMEM;
 }
 
 static int se401_stop_stream(struct usb_se401 *se401)
#1 lore raw
Quoted 35 lines · Amit Choudhary

Description: Check the return value of kmalloc() in function se401_start_stream(), in file drivers/media/video/se401.c.

drivers/media/video/se401.c +5 -1
index 7aeec57..fe94227 100644
@@ -450,6 +450,8 @@ 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)
+			goto nomem_err;
 	}
 
 	se401->bayeroffset=0;
@@ -458,13 +460,15 @@ 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)
+			goto nomem_err;
 		se401->scratch[i].state=BUFFER_UNUSED;
 	}
 
 	for (i=0; i<SE401_NUMSBUF; i++) {
 		urb=usb_alloc_urb(0, GFP_KERNEL);
 		if(!urb)
-			return -ENOMEM;
+			goto nomem_err;
 
 		usb_fill_bulk_urb(urb, se401->dev,
 			usb_rcvbulkpipe(se401->dev, SE401_VIDEO_ENDPOINT),

drivers/media/video/se401.c static int se401_start_stream(struct usb · line 495

Quoted 10 lines
drivers/media/video/se401.c +7 -0
@@ -482,6 +486,20 @@ static int se401_start_stream(struct usb
 	se401->framecount=0;
 
 	return 0;
+
+ nomem_err:
+	for (i=0; i<SE401_NUMSBUF; i++) {
+		usb_kill_urb(se401->urb[i]);
+		usb_free_urb(se401->urb[i]);
+		se401->urb[i] = NULL;
+		kfree(se401->sbuf[i].data);

...

I see before se401_start_stream usually this is done:

static int se401_stop_stream(struct usb_se401 *se401) {
...

	for (i=0; i<SE401_NUMSBUF; i++) if (se401->urb[i]) {
		usb_kill_urb(se401->urb[i]);
		usb_free_urb(se401->urb[i]);
		se401->urb[i]=NULL;
		kfree(se401->sbuf[i].data);
	}
	for (i=0; i<SE401_NUMSCRATCH; i++) {
		kfree(se401->scratch[i].data);
		se401->scratch[i].data=NULL;
	}

	return 0;
}

... but because above there is no:
se401->sbuf[i].data=NULL;
after kfree(se401->sbuf[i].data);
it is possible that in se401_start_stream we have kmalloc error for e.g. i == 0 but kfree for i >= 1, which could be not NULL (but kfreed)...

Regards,

Jarek P.