mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	pstore/ram: Fix error-path memory leak in persistent_ram_new() callers
For callers that allocated a label for persistent_ram_new(), if the call
fails, they must clean up the allocation.
Suggested-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Fixes: 1227daa43b ("pstore/ram: Clarify resource reservation labels")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/lkml/20191211191353.14385-1-navid.emamdoost@gmail.com
Signed-off-by: Kees Cook <keescook@chromium.org>
			
			
This commit is contained in:
		
							parent
							
								
									d1eef1c619
								
							
						
					
					
						commit
						8df955a32a
					
				
					 1 changed files with 2 additions and 0 deletions
				
			
		| 
						 | 
					@ -577,6 +577,7 @@ static int ramoops_init_przs(const char *name,
 | 
				
			||||||
			dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
 | 
								dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
 | 
				
			||||||
				name, record_size,
 | 
									name, record_size,
 | 
				
			||||||
				(unsigned long long)*paddr, err);
 | 
									(unsigned long long)*paddr, err);
 | 
				
			||||||
 | 
								kfree(label);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			while (i > 0) {
 | 
								while (i > 0) {
 | 
				
			||||||
				i--;
 | 
									i--;
 | 
				
			||||||
| 
						 | 
					@ -622,6 +623,7 @@ static int ramoops_init_prz(const char *name,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
 | 
							dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
 | 
				
			||||||
			name, sz, (unsigned long long)*paddr, err);
 | 
								name, sz, (unsigned long long)*paddr, err);
 | 
				
			||||||
 | 
							kfree(label);
 | 
				
			||||||
		return err;
 | 
							return err;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue