From patchwork Thu Mar 22 22:07:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 889682 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="A8WUgfeS"; 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 406gtT068Fz9s0y for ; Fri, 23 Mar 2018 09:13:53 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 28BD0F2E; Thu, 22 Mar 2018 22:08:14 +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 274A4ECE for ; Thu, 22 Mar 2018 22:08:08 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id DB78F5D3 for ; Thu, 22 Mar 2018 22:08:07 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id m68so3922542pfm.11 for ; Thu, 22 Mar 2018 15:08:07 -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:in-reply-to:references; bh=1dbl3wRfWicWRcfXK7B3geAHkg2Ikc8bGDGLTod14Ao=; b=A8WUgfeSTuWEpzru5qAEXekh8+KrVmfGd2QLtSk1Im1kM+JuV0eyaO52poSXVTDk3Z v2McNS4KQJlTcJURgA/0zVwjLmv2gzOSG10gQKqibi6e5VNTF//i4nLE8moZlm7Eldiy wIaCL5gkyDltDyVhael+8SqZlZ1JNueJTbQGEAs2b5JYvdEN1KS6WNwsBoxpTCJ6lODp l8dOU5aaKaC/53f9diKsGm7EaC3GHTwUsbfVdXRc5OJXPhG9vLpWzOB2+MmPwDbcQtza FqYTGLSs7e8OpZFH27xVd5mBA4gw4a/knK9bys1U/2d+1dn3NfKi6IrTcNIWX2Ykqc5R quEw== 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:in-reply-to :references; bh=1dbl3wRfWicWRcfXK7B3geAHkg2Ikc8bGDGLTod14Ao=; b=gaATJvsbPc/MPvzzb0K2r3PYyBwjxPJ1jI+PwNncRj+K+RTjWVg9lOQnkAgqd9+pRa mkTDIJJuPsWcUDDKw2FKVA9Y68oytpUaVyDP0W2FtmFEMomJKkyl2CHBl+LYNgQuIMpP 1fQOltDjcIZ3WAELkdAYRlBuV6Z8TAKH51RDOH24kk4izGHN0AwTaiLvIb1K+dvDxXyv Yk4QyVx3M0AKUvhZyMv+Y3I62XSvg8eojQbTsK91ngm9Y9ojjXadjXHyDxH6tzHEG1Rw x+lqdxkgMOli/+9uH9t5b+1Tm72wgUz/jRzgMzHF5a8xKPhcPdkPakLGA/4hn2bgub0p UgTQ== X-Gm-Message-State: AElRT7EY5vX2v4Jg2oLgdTPxETS4J+4QXnTN7sU3SnO4RKAKS2y57W/m XWR/rxjLTxeTtMv04mtFSHwqIg== X-Google-Smtp-Source: AG47ELvT28cRgmQ885tVQkqxPBvNkkvD0yTt0M35eb/3RM3uD2JfDdgFlEOsaZxJ5zy85ljFd9J8RQ== X-Received: by 10.99.127.91 with SMTP id p27mr18996216pgn.28.1521756487152; Thu, 22 Mar 2018 15:08:07 -0700 (PDT) Received: from gizo.domain (184-100-240-187.ptld.qwest.net. [184.100.240.187]) by smtp.gmail.com with ESMTPSA id 4sm2280775pfn.32.2018.03.22.15.08.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 15:08:06 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Thu, 22 Mar 2018 15:07:30 -0700 Message-Id: <1521756461-3870-15-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1521756461-3870-1-git-send-email-gvrose8192@gmail.com> References: <1521756461-3870-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Haishuang Yan Subject: [ovs-dev] [ERSPAN RFC 14/25] ip_gre: fix potential memory leak in erspan_rcv 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 From: Haishuang Yan Upstream commit: commit 50670b6ee9bc4ae8f9ce3112b437987adf273245 Author: Haishuang Yan Date: Wed Dec 20 10:07:00 2017 +0800 ip_gre: fix potential memory leak in erspan_rcv If md is NULL, tun_dst must be freed, otherwise it will cause memory leak. Fixes: 1a66a836da6 ("gre: add collect_md mode to ERSPAN tunnel") Cc: William Tu Signed-off-by: Haishuang Yan Signed-off-by: David S. Miller Cc: Haishuang Yan Signed-off-by: Greg Rose --- datapath/linux/compat/ip_gre.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index 7cd35a3..f315b16 100644 --- a/datapath/linux/compat/ip_gre.c +++ b/datapath/linux/compat/ip_gre.c @@ -193,8 +193,10 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi, tun_id, sizeof(*md)); md = ip_tunnel_info_opts(&tun_dst.u.tun_info); - if (!md) + if (!md) { + dst_release((struct dst_entry *)tun_dst); return PACKET_REJECT; + } memcpy(md, pkt_md, sizeof(*md)); info = &tun_dst.u.tun_info;