From patchwork Thu Apr 4 11:36:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devendra Naga X-Patchwork-Id: 233721 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0CD062C00A1 for ; Thu, 4 Apr 2013 22:36:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758682Ab3DDLgi (ORCPT ); Thu, 4 Apr 2013 07:36:38 -0400 Received: from mail-pb0-f43.google.com ([209.85.160.43]:49579 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758670Ab3DDLgh (ORCPT ); Thu, 4 Apr 2013 07:36:37 -0400 Received: by mail-pb0-f43.google.com with SMTP id md4so1399548pbc.16 for ; Thu, 04 Apr 2013 04:36:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=mWVtaBc8ybNCSPD1sMXqgS7GJxmo8EqhH2eKpJ90eMQ=; b=ZkXF7hllDkvPZWv5dlbvY+NAoUYeTON9KZ0n1DX3qrOJQO3vcgDMttcDmrul7y50JF rv8h24PWKNYd+CG7fM81AVPwj/UirItpYV6aKqaWyNEGWyDikFbxx+d/eja0uJSI8ZWw VqLW1Psxfe1yzemz1O5E2t9M/UfMABkZvXEPy4jFMaDxi3NKXkSIViklzVlN3KCozvAO bxSYYX+OWUHJIBu3rCIsgRL5u4EngYEWTMwDjcBaE4yn9+Cjz3J5CHrARen7o8XQC3gE 135D+QhTdevvCiRhnRy7vXcBpV5wnRz3okSAWKZyYwGD26+1foZSTtiK2QwjdymXlZd5 TARg== X-Received: by 10.68.129.34 with SMTP id nt2mr8301168pbb.90.1365075396982; Thu, 04 Apr 2013 04:36:36 -0700 (PDT) Received: from localhost.localdomain ([117.215.128.178]) by mx.google.com with ESMTPS id u9sm11106831paf.22.2013.04.04.04.36.33 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 04:36:35 -0700 (PDT) From: Devendra Naga To: Stephen Hemminger , netdev@vger.kernel.org Cc: Devendra Naga Subject: [PATCH] bridge-utils: fix AF_LOCAL socket leaks Date: Thu, 4 Apr 2013 17:06:26 +0530 Message-Id: <1365075386-2363-1-git-send-email-devendra.aaru@gmail.com> X-Mailer: git-send-email 1.8.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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: ==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 Signed-off-by: Devendra Naga --- brctl/brctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/brctl/brctl.c b/brctl/brctl.c index 46ca352..16080a7 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,7 +80,10 @@ int main(int argc, char *const* argv) return 1; } - return cmd->func(argc, argv); + ret = cmd->func(argc, argv); + br_shutdown(); + + return ret; help: help();