From patchwork Mon Nov 12 12:20:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 996393 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=samsung.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="FmA+sM++"; 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 42tqbm3StZz9s0n for ; Mon, 12 Nov 2018 23:20:52 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9118DB08; Mon, 12 Nov 2018 12:20:49 +0000 (UTC) X-Original-To: ovs-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 4473EA48 for ; Mon, 12 Nov 2018 12:20:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D060E828 for ; Mon, 12 Nov 2018 12:20:47 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20181112122046euoutp029a50ff2a1c795de41fae2687090dafb5~mX8qWkPxX2455624556euoutp02b for ; Mon, 12 Nov 2018 12:20:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20181112122046euoutp029a50ff2a1c795de41fae2687090dafb5~mX8qWkPxX2455624556euoutp02b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1542025246; bh=OxNSXCdSVqpxxyQAhm1rkUaw9ccbGy9qeaiPBpArvaU=; h=From:To:Cc:Subject:Date:References:From; b=FmA+sM++qFtSNCg+JkjfaJVUEO2zcQUoIGTdtB7GNwtYRDJh2kAB+75UgKODeq1DZ iVTLxERJoOJuDF/oW7ZL97SiKSFI0zgypftPOsmiLqfA5djH9ihqVfyiwOO3diCWS7 ya3O3e7+GFThUxG3X+E6ltmw5GdDcc2cVUWsGmpA= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181112122045eucas1p249799809225c0cc5422b377047bab8c3~mX8p5xK8Z2746727467eucas1p28; Mon, 12 Nov 2018 12:20:45 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 32.4F.04441.D1079EB5; Mon, 12 Nov 2018 12:20:45 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20181112122044eucas1p114ba2b1212e35ef29067dacb85da435d~mX8pFZiwq2850828508eucas1p1O; Mon, 12 Nov 2018 12:20:44 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20181112122044eusmtrp26e023679a47bb4411e7ae03d2c860a27~mX8o2-aim2202522025eusmtrp2N; Mon, 12 Nov 2018 12:20:44 +0000 (GMT) X-AuditID: cbfec7f2-5e3ff70000001159-e5-5be9701d451b Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 9F.54.04284.C1079EB5; Mon, 12 Nov 2018 12:20:44 +0000 (GMT) Received: from imaximets.rnd.samsung.ru (unknown [106.109.129.180]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20181112122044eusmtip2f6927f8bfce2df1b56eedc51d94f8c9f~mX8ogXMAz3137431374eusmtip2i; Mon, 12 Nov 2018 12:20:44 +0000 (GMT) From: Ilya Maximets To: ovs-dev@openvswitch.org, Ben Pfaff Date: Mon, 12 Nov 2018 15:20:39 +0300 Message-Id: <20181112122039.17791-1-i.maximets@samsung.com> X-Mailer: git-send-email 2.17.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDIsWRmVeSWpSXmKPExsWy7djPc7qyBS+jDb7PFbJ4NbmB0eJK+092 i8WrWhkt5n56zujA4vHs5n9Gj+fXelg83u+7yubRt2UVYwBLFJdNSmpOZllqkb5dAldG7+/3 bAUfeCre3l7G1MDYydXFyMkhIWAisWXOZ+YuRi4OIYEVjBKn9rexQzhfGCW2Lf/PAuF8ZpT4 MvkdO0zLkv9HoVqWM0qs3PWWCcL5wSixtukKK0gVm4COxKnVRxhBbBGgjmVTv7GB2MwCMRLf 7l0Es4UFzCUmNx0Hq2ERUJXYe3w2E4jNK2AtMW92PxPENnmJ1RsOgG2TENjDJjH/+xMWiISL xKW+r2wQtrDEq+NboM6Tkfi/cz5Uc73E/ZaXjBDNHYwS0w/9g0rYS2x5fQ6ogQPoIk2J9bv0 IcKOEh/vHWMCCUsI8EnceCsIcTOfxKRt05khwrwSHW1CENUqEr8PLmeGsKUkbr77DHWBh8TJ y5vAwSAkECsx/9ompgmMcrMQdi1gZFzFKJ5aWpybnlpsmJdarlecmFtcmpeul5yfu4kRGOen /x3/tIPx66WkQ4wCHIxKPLwapS+ihVgTy4orcw8xSnAwK4nw8vG8jBbiTUmsrEotyo8vKs1J LT7EKM3BoiTOW83wIFpIID2xJDU7NbUgtQgmy8TBKdXAKJn0ci5bO/Mvx0dC5i6PXKUsn6uZ m9Q1K/CyCq8tjZ85Q1znqo7X0VNGnqwvPvbyJ3AZrXy9f2J2jti9HqGmrAq2hKi7Hfkhl/em 6PTkrqrJVFObXMhSKbNIJ2fCn08Cx6W1N+et3/JgzUybgsbr1Ytmlnz5W6Sgfrbw5Zu4hFO/ 2BpUxWYqsRRnJBpqMRcVJwIArRFPVe8CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrILMWRmVeSWpSXmKPExsVy+t/xe7oyBS+jDW5skrN4NbmB0eJK+092 i8WrWhkt5n56zujA4vHs5n9Gj+fXelg83u+7yubRt2UVYwBLlJ5NUX5pSapCRn5xia1StKGF kZ6hpYWekYmlnqGxeayVkamSvp1NSmpOZllqkb5dgl5G7+/3bAUfeCre3l7G1MDYydXFyMkh IWAiseT/UeYuRi4OIYGljBL3Z09ghUhISfz4dQHKFpb4c62LDaLoG6PEn+tT2UASbAI6EqdW H2HsYuTgEBEwk9jyzxIkzCwQI3F9Uy9YibCAucTkpuOMIDaLgKrE3uOzmUBsXgFriXmz+5kg 5stLrN5wgHkCI88CRoZVjCKppcW56bnFhnrFibnFpXnpesn5uZsYgcG17djPzTsYL20MPsQo wMGoxMOrUfoiWog1say4MvcQowQHs5IILx/Py2gh3pTEyqrUovz4otKc1OJDjKZAyycyS4km 5wMDP68k3tDU0NzC0tDc2NzYzEJJnPe8QWWUkEB6YklqdmpqQWoRTB8TB6dUAyPLngt/mT4Y ByVOv+TpsKNRptPgTdS2fR7TPf4wTdF6um2m0f1vf1+enbNS0qjyaMsxA1XdY/wpkh8c1P9e D5oZFjRNU0CUZ67ZT1enbp+yA4lyGwp13DZ+llWx3uliZDYpctGS/f3fn3Y9frLtr5OEF9/K 1Lbtz/x9jwfPerhi5dtABrPV/+crsRRnJBpqMRcVJwIAM4h4sUQCAAA= X-CMS-MailID: 20181112122044eucas1p114ba2b1212e35ef29067dacb85da435d X-Msg-Generator: CA X-RootMTR: 20181112122044eucas1p114ba2b1212e35ef29067dacb85da435d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181112122044eucas1p114ba2b1212e35ef29067dacb85da435d References: X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ilya Maximets Subject: [ovs-dev] [PATCH] pinctrl: Fix dp_packet structure leak. 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 Buffered packets are always packets created by 'dp_packet_clone_data()' i.e. they are malloced. It's not enough to free the packet data, dp_packet structure must be freed too. 'dp_packet_delete()' will take care of that. CC: Lorenzo Bianconi Fixes: d7abfe39cfd2 ("OVN: add buffering support for ip packets") Signed-off-by: Ilya Maximets Acked-by: Lorenzo Bianconi --- ovn/controller/pinctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c index 21454ab47..56539a891 100644 --- a/ovn/controller/pinctrl.c +++ b/ovn/controller/pinctrl.c @@ -229,7 +229,7 @@ destroy_buffered_packets(struct buffered_packets *bp) while (bp->head != bp->tail) { bi = &bp->data[bp->head]; - dp_packet_uninit(bi->p); + dp_packet_delete(bi->p); ofpbuf_uninit(&bi->ofpacts); bp->head = (bp->head + 1) % BUFFER_QUEUE_DEPTH; @@ -267,7 +267,7 @@ buffered_push_packet(struct buffered_packets *bp, if (next == bp->head) { bi = &bp->data[bp->head]; - dp_packet_uninit(bi->p); + dp_packet_delete(bi->p); ofpbuf_uninit(&bi->ofpacts); bp->head = (bp->head + 1) % BUFFER_QUEUE_DEPTH; } @@ -296,7 +296,7 @@ buffered_send_packets(struct buffered_packets *bp, struct eth_addr *addr) queue_msg(ofputil_encode_packet_out(&po, proto)); ofpbuf_uninit(&bi->ofpacts); - dp_packet_uninit(bi->p); + dp_packet_delete(bi->p); bp->head = (bp->head + 1) % BUFFER_QUEUE_DEPTH; }