From patchwork Fri Oct 11 22:50:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1175611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AnZX5anA"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46qjzk2l9tz9sP4 for ; Sat, 12 Oct 2019 09:58:25 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 263661CB6; Fri, 11 Oct 2019 22:58:21 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id DB0AC1C99 for ; Fri, 11 Oct 2019 22:50:55 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id C38E014D for ; Fri, 11 Oct 2019 22:50:54 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id 205so6921877pfw.2 for ; Fri, 11 Oct 2019 15:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=D+zwXaPFN9AAmkTEc9FwoOUsklXerd/KTOvB/QlmzXU=; b=AnZX5anAsxFxvL+Lbppm/ppovipO7Phio7IX3RHR/k3hsbcAS7JqHsujKDJ+/KRZZy ehOcDVFu2GdCIdlMqi9pAHgeWGHoHb30asIH+e/4EU+Ji6j64Yvk83Q078hQS3cVjOVq m2X85LKm/rLTsTt+ZxEfWzuoA58j1+ioTWGlQHB15aqNtAiDejyiDrUCn0qsJAJHmHeM YDOm8AVs46cDSGRhkFDxh6wVnWwB74vC0LXrcS/8wDuURrtIt1b+tz4ygh9S1Edff0y8 SZ+pCB+VUNCDdU4yy+IO0oomBdsX3DK4MnU0yyMmb7KLZh7FXkLy3ZTuLUKXOxCB7mhu Lo1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=D+zwXaPFN9AAmkTEc9FwoOUsklXerd/KTOvB/QlmzXU=; b=XEBAz41aXQFIIFPFltotCQlEGTU1fMiQV6k2uHUwiP4Z9oxIXem+bP4VLPwOFOy49K NCdk7gqAdJYNCE4K0uJYyaXtcSqoH89r54A5hL/kjyLDllJU+HZE8m1heVMWvCenlecA F/T5WfaB1xGUua8Obu+Aj//VYnRa0B3QlfjAcZam7CK4vSqdawMyky2AuYTxSJhIklT2 UmqMiifOxZNjosMl4vqptcB99qNgtLSWLzLhdqqovEghsUrPdaATv/f/l8v5XIm2xeQr yUN0j9vGPSfBQtzhKw49dSkrJ7xOCUwLpDHp09KfqHCQoBAlWqB1xHYnWLe7Gy7p4ott 00iw== X-Gm-Message-State: APjAAAUj2ZDAKAcbQvDwsS0uCf0fTMZYT7pvGRW36MjSYRZsvHs0dw7R igOqf5uAFjEJKcyZJY4u1W+fJD7BwZM= X-Google-Smtp-Source: APXvYqybltb1zTo8i/Q0Z7PQy0gW8Ynma1ur5GG2/1N8ExYel+Swhxm2xymr4/EEep8m7Ny3nBanhw== X-Received: by 2002:a17:90a:b902:: with SMTP id p2mr19487673pjr.62.1570834253900; Fri, 11 Oct 2019 15:50:53 -0700 (PDT) Received: from kern417.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id f89sm8601787pje.20.2019.10.11.15.50.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Oct 2019 15:50:53 -0700 (PDT) From: Yifeng Sun To: dev@openvswitch.org Date: Fri, 11 Oct 2019 15:50:47 -0700 Message-Id: <1570834247-31500-1-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] dpif-netlink: Free leaked nl_sock X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Valgrind reports: 20 bytes in 1 blocks are definitely lost in loss record 94 of 353 by 0x532594: xmalloc (util.c:138) by 0x553EAD: nl_sock_create (netlink-socket.c:146) by 0x54331D: create_nl_sock (dpif-netlink.c:255) by 0x54331D: dpif_netlink_port_add__ (dpif-netlink.c:756) by 0x5435F6: dpif_netlink_port_add_compat (dpif-netlink.c:876) by 0x5435F6: dpif_netlink_port_add (dpif-netlink.c:922) by 0x47EC1D: dpif_port_add (dpif.c:584) by 0x42B35F: port_add (ofproto-dpif.c:3721) by 0x41E64A: ofproto_port_add (ofproto.c:2032) by 0x40B3FE: iface_do_create (bridge.c:1817) by 0x40B3FE: iface_create (bridge.c:1855) by 0x40B3FE: bridge_add_ports__ (bridge.c:943) by 0x40D14A: bridge_add_ports (bridge.c:959) by 0x40D14A: bridge_reconfigure (bridge.c:673) by 0x410D75: bridge_run (bridge.c:3050) by 0x407614: main (ovs-vswitchd.c:127) This leak is because when vport_add_channel() returns 0, it is expected to take the ownership of 'socksp'. This patch fixes this issue. Signed-off-by: Yifeng Sun --- lib/dpif-netlink.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index ceb39cde1ab1..ebe22106e0fc 100644 --- a/lib/dpif-netlink.c +++ b/lib/dpif-netlink.c @@ -458,6 +458,7 @@ vport_add_channel(struct dpif_netlink *dpif, odp_port_t port_no, int error; if (dpif->handlers == NULL) { + close_nl_sock(socksp); return 0; }