c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix spa config generate memory leak in spa_load_best function

Browse Source 
When spa retry load succeeds and spa recovery is requested it may
leak in spa_load_best function.  Always free the generated config
when it is not assigned to the spa.

Signed-off-by: cao.xuewen <cao.xuewen@zte.com.cn>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4940
This commit is contained in:
heary-cao 2016-08-06 15:08:51 +08:00 committed by Brian Behlendorf
parent 5a5170884a
commit ee6370a7a4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/spa.c
View File

@ -3095,6 +3095,8 @@ spa_load_best(spa_t *spa, spa_load_state_t state, int mosconfig,
if (config && (rewind_error || state != SPA_LOAD_RECOVER)) if (config && (rewind_error || state != SPA_LOAD_RECOVER))
spa_config_set(spa, config); spa_config_set(spa, config);
else
nvlist_free(config);
if (state == SPA_LOAD_RECOVER) { if (state == SPA_LOAD_RECOVER) {
ASSERT3P(loadinfo, ==, NULL); ASSERT3P(loadinfo, ==, NULL);