Re: [PATCH 3/4] Fix memory leak in file Manage

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 4/6/23 07:40, Guanqin Miao wrote:
> When we test mdadm with asan, we found some memory leaks in Manage.c
> We fix these memory leaks based on code logic.
> 
> Signed-off-by: Guanqin Miao <miaoguanqin@xxxxxxxxxx>
> Signed-off-by: Li Xiao Keng <lixiaokeng@xxxxxxxxxx>
> ---
>  Manage.c | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/Manage.c b/Manage.c
> index fde6aba3..82bcb255 100644
> --- a/Manage.c
> +++ b/Manage.c
> @@ -222,6 +222,8 @@ int Manage_stop(char *devname, int fd, int verbose, int will_retry)
>  		if (verbose >= 0)
>  			pr_err("Cannot get exclusive access to %s:Perhaps a running process, mounted filesystem or active volume group?\n",
>  			       devname);
> +		if (mdi)
> +			sysfs_free(mdi);
>  		return 1;
>  	}
>  	/* If this is an mdmon managed array, just write 'inactive'
> @@ -818,8 +820,15 @@ int Manage_add(int fd, int tfd, struct mddev_dev *dv,
>  						    rdev, update, devname,
>  						    verbose, array);
>  				dev_st->ss->free_super(dev_st);
> -				if (rv)
> +				if (rv) {
> +					free(dev_st);
>  					return rv;
> +				}
> +			}
> +			if (dev_st) {
> +				if (dev_st->sb)
> +					dev_st->ss->free_super(dev_st);
> +				free(dev_st);
>  			}
>  		}
>  		if (dv->disposition == 'M') {
> @@ -1716,6 +1725,8 @@ int Manage_subdevs(char *devname, int fd,
>  			break;
>  		}
>  	}
> +	if (tst)
> +		free(tst);

free(NULL) is valid

>  	if (frozen > 0)
>  		sysfs_set_str(&info, NULL, "sync_action","idle");
>  	if (test && count == 0)
> @@ -1723,6 +1734,8 @@ int Manage_subdevs(char *devname, int fd,
>  	return 0;
>  
>  abort:
> +	if (tst)
> +		free(tst);

Same here

>  	if (frozen > 0)
>  		sysfs_set_str(&info, NULL, "sync_action","idle");
>  	return !test && busy ? 2 : 1;




[Index of Archives]     [Linux RAID Wiki]     [ATA RAID]     [Linux SCSI Target Infrastructure]     [Linux Block]     [Linux IDE]     [Linux SCSI]     [Linux Hams]     [Device Mapper]     [Device Mapper Cryptographics]     [Kernel]     [Linux Admin]     [Linux Net]     [GFS]     [RPM]     [git]     [Yosemite Forum]


  Powered by Linux