[<prev] [next>] [day] [month] [year] [list]
Date: Thu, 4 Apr 2013 17:14:19 +0530
From: Devendra Naga <devendra.aaru@...il.com>
To: Stephen Hemminger <shemminger@...tta.com>, netdev@...r.kernel.org
Cc: Devendra Naga <devendra.aaru@...il.com>
Subject: [PATCH V2] bridge-utils: fix AF_LOCAL socket leaks
valgrind reported the following leak on fc18 system:
valgrind -v --leak-check=full --track-fds=yes ./brctl show
==27307==
==27307== FILE DESCRIPTORS: 4 open at exit.
==27307== Open AF_UNIX socket 3: <unknown>
==27307== at 0x397B2F3617: socket (in /usr/lib64/libc-2.16.so)
==27307== by 0x403CF7: br_init (libbridge_init.c:35)
==27307== by 0x4010BF: main (brctl.c:63)
fix it by calling br_shutdown
the same leak may occur if the command is ./brctl addbr or ./brctl delbr
because the goto directly goes to help() rather closing it.
Signed-off-by: Devendra Naga <devendra.aaru@...il.com>
---
brctl/brctl.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/brctl/brctl.c b/brctl/brctl.c
index 46ca352..84b7536 100644
--- a/brctl/brctl.c
+++ b/brctl/brctl.c
@@ -43,6 +43,7 @@ int main(int argc, char *const* argv)
{ .name = "version", .val = 'V' },
{ 0 }
};
+ int ret;
while ((f = getopt_long(argc, argv, "Vh", options, NULL)) != EOF)
switch(f) {
@@ -79,9 +80,13 @@ int main(int argc, char *const* argv)
return 1;
}
- return cmd->func(argc, argv);
+ ret = cmd->func(argc, argv);
+ br_shutdown();
+
+ return ret;
help:
+ br_shutdown();
help();
return 1;
}
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists