* [PATCH V2] bridge-utils: fix AF_LOCAL socket leaks
@ 2013-04-04 11:44 Devendra Naga
0 siblings, 0 replies; only message in thread
From: Devendra Naga @ 2013-04-04 11:44 UTC (permalink / raw)
To: Stephen Hemminger, netdev; +Cc: Devendra Naga
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@gmail.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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-04 11:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-04 11:44 [PATCH V2] bridge-utils: fix AF_LOCAL socket leaks Devendra Naga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).