Subject: Re: [PATCH v7 09/10] ss: fixed free on local array for valid json output

From: Phil Sutter <[email-masked]>
Date: Tue, 27 Oct 2015 14:19:22 +0100

On Thu, Sep 10, 2015 at 09:35:07PM +0200, Matthias Tafelmeier wrote:
> Minor fix to enable json output. Freeing of automatic char array name
> which will get freed after function stack cleanup. Another one after
> tcp_stats_fmt for freeing automatic tcpstats struct instance.
> 
> Signed-off-by: Matthias Tafelmeier <[email-masked]>
> ---
>  misc/ss.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/misc/ss.c b/misc/ss.c
> index 6ff40a3..80aebe6 100644
> --- a/misc/ss.c
> +++ b/misc/ss.c
> @@ -1660,10 +1660,6 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
>  		s.segs_out = info->tcpi_segs_out;
>  		s.segs_in = info->tcpi_segs_in;
>  		tcp_stats_fmt(&s);
> -		if (s.dctcp)
> -			free(s.dctcp);
> -		if (s.cong_alg)
> -			free(s.cong_alg);
>  	}
>  }
>  
> @@ -2362,8 +2358,6 @@ static int unix_show_sock(const struct sockaddr_nl *addr, struct nlmsghdr *nlh,
>  	if (json_output)
>  		jsonw_end_object(json_wr);
>  
> -	if (name)
> -		free(name);
>  	return 0;
>  }

Is it necessary to fix earlier patches in this dedicated patch or can't
you just fold these changes into the patches where they belong?

>  
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to [email-masked]
> More majordomo info at  http://vger.kernel.org/majordomo-info.html