Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 16:29:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] mantis: Fix error handling in mantis_dma_init()

Browse Source 
Current code assigns 0 to variable 'err', which makes mantis_dma_init()
to return success even if mantis_alloc_buffers() fails.

Fix it by checking the return value from mantis_alloc_buffers() and
propagating it in the case of error.

Reported-by: RUC_Soft_Sec <zy900702@163.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Fabio Estevam 2015-08-10 14:11:41 -03:00 committed by Mauro Carvalho Chehab
parent 72c5b7b24f
commit 02387b5f25
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/pci/mantis/mantis_dma.c
View File

@ -130,10 +130,11 @@ err:
int mantis_dma_init(struct mantis_pci *mantis) int mantis_dma_init(struct mantis_pci *mantis)
{ {
int err = 0; int err;
dprintk(MANTIS_DEBUG, 1, "Mantis DMA init"); dprintk(MANTIS_DEBUG, 1, "Mantis DMA init");
if (mantis_alloc_buffers(mantis) < 0) { err = mantis_alloc_buffers(mantis);
if (err < 0) {
dprintk(MANTIS_ERROR, 1, "Error allocating DMA buffer"); dprintk(MANTIS_ERROR, 1, "Error allocating DMA buffer");
/* Stop RISC Engine */ /* Stop RISC Engine */