[PATCH v4 09/10] ss: fixed free on local array for valid json output
From: Matthias Tafelmeier <hidden>
Date: 2015-08-30 13:25:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> Suggested-by: Hagen Paul Pfeifer <redacted> --- 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; }
--
1.9.1