mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	media: cxd2880-spi: fix two memory leaks of dvb_spi
There are two return paths that do not kfree dvb_spi. Fix the memory
leaks by returning via the exit label fail_adapter that will free
dvi_spi.
Detected by CoverityScan, CID#1475991 ("Resource Leak")
Fixes: cb496cd472 ("media: cxd2880-spi: Add optional vcc regulator")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Yasunari Takiguchi <Yasunari.Takiguchi@sony.com>?
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
			
			
This commit is contained in:
		
							parent
							
								
									9502cdf080
								
							
						
					
					
						commit
						c54dbfcda3
					
				
					 1 changed files with 5 additions and 3 deletions
				
			
		| 
						 | 
					@ -522,13 +522,15 @@ cxd2880_spi_probe(struct spi_device *spi)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	dvb_spi->vcc_supply = devm_regulator_get_optional(&spi->dev, "vcc");
 | 
						dvb_spi->vcc_supply = devm_regulator_get_optional(&spi->dev, "vcc");
 | 
				
			||||||
	if (IS_ERR(dvb_spi->vcc_supply)) {
 | 
						if (IS_ERR(dvb_spi->vcc_supply)) {
 | 
				
			||||||
		if (PTR_ERR(dvb_spi->vcc_supply) == -EPROBE_DEFER)
 | 
							if (PTR_ERR(dvb_spi->vcc_supply) == -EPROBE_DEFER) {
 | 
				
			||||||
			return -EPROBE_DEFER;
 | 
								ret = -EPROBE_DEFER;
 | 
				
			||||||
 | 
								goto fail_adapter;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
		dvb_spi->vcc_supply = NULL;
 | 
							dvb_spi->vcc_supply = NULL;
 | 
				
			||||||
	} else {
 | 
						} else {
 | 
				
			||||||
		ret = regulator_enable(dvb_spi->vcc_supply);
 | 
							ret = regulator_enable(dvb_spi->vcc_supply);
 | 
				
			||||||
		if (ret)
 | 
							if (ret)
 | 
				
			||||||
			return ret;
 | 
								goto fail_adapter;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	dvb_spi->spi = spi;
 | 
						dvb_spi->spi = spi;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue