lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 19 Oct 2006 22:59:29 -0700 From: Amit Choudhary <amit2030@...il.com> To: Linux Kernel <linux-kernel@...r.kernel.org> Subject: [PATCH 2.6.19-rc2] [REVISED] drivers/media/video/stv680.c: check kmalloc() return value. Description: Check the return value of kmalloc() in function stv680_start_stream(), in file drivers/media/video/stv680.c. Signed-off-by: Amit Choudhary <amit2030@...il.com> diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c index 6d1ef1e..f35c664 100644 --- a/drivers/media/video/stv680.c +++ b/drivers/media/video/stv680.c @@ -687,7 +687,11 @@ static int stv680_start_stream (struct u stv680->sbuf[i].data = kmalloc (stv680->rawbufsize, GFP_KERNEL); if (stv680->sbuf[i].data == NULL) { PDEBUG (0, "STV(e): Could not kmalloc raw data buffer %i", i); - return -1; + for (i = i - 1; i >= 0; i--) { + kfree(stv680->sbuf[i].data); + stv680->sbuf[i].data = NULL; + } + return -ENOMEM; } } @@ -698,15 +702,25 @@ static int stv680_start_stream (struct u stv680->scratch[i].data = kmalloc (stv680->rawbufsize, GFP_KERNEL); if (stv680->scratch[i].data == NULL) { PDEBUG (0, "STV(e): Could not kmalloc raw scratch buffer %i", i); - return -1; + for (i = i - 1; i >= 0; i--) { + kfree(stv680->scratch[i].data); + stv680->scratch[i].data = NULL; + } + goto nomem_sbuf; } stv680->scratch[i].state = BUFFER_UNUSED; } for (i = 0; i < STV680_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(stv680->urb[i]); + usb_free_urb(stv680->urb[i]); + stv680->urb[i] = NULL; + } + goto nomem_scratch; + } /* sbuf is urb->transfer_buffer, later gets memcpyed to scratch */ usb_fill_bulk_urb (urb, stv680->udev, @@ -721,6 +735,18 @@ static int stv680_start_stream (struct u stv680->framecount = 0; return 0; + + nomem_scratch: + for (i=0; i<STV680_NUMSCRATCH; i++) { + kfree(stv680->scratch[i].data); + stv680->scratch[i].data = NULL; + } + nomem_sbuf: + for (i=0; i<STV680_NUMSBUF; i++) { + kfree(stv680->sbuf[i].data); + stv680->sbuf[i].data = NULL; + } + return -ENOMEM; } static int stv680_stop_stream (struct usb_stv *stv680) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists