From patchwork Tue Jul 10 16:15:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 942088 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="RfQx0vMb"; 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 41Q6k36dv3z9s00 for ; Wed, 11 Jul 2018 02:15:23 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id EC34DD33; Tue, 10 Jul 2018 16:15:20 +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 A8169CE3 for ; Tue, 10 Jul 2018 16:15:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 787FFE2 for ; Tue, 10 Jul 2018 16:15:19 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id e10-v6so16428928pfn.1 for ; Tue, 10 Jul 2018 09:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=/T+xowCaIqOsvU1g5gNJyDyU+/UM/IA5kePYRxOSk1s=; b=RfQx0vMbhN0+aa7RHykR5clnx6ozse6dKf42ymrKGBq4UFFKznuYaOgYwcAQphOK3R Gx0BkZCOOd9AfPi9VmuuEzRSKnxyDzuBpn/03xpx2YuW5kVgWb6lkBmvRIQayxmqM7WH lBp/RbGgaY/JhnlF9ciwyW4+5Q8uykhxMIpGJPwgv4HlD08bZfWgCWGEfHM/5C41sxUk xo4m1TuF5AH4yS5pnE5VsDE+iDtBrvZJSMhC1b7XtWnDUdriIlumANNg8xeei1oAG0gl Mc05h6Wdg7FylBLP2IwWAXFljQJA+3xT3sR/LRM4dDGLgAlyVWSAd6i4PROUY0IgzZnF KoSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=/T+xowCaIqOsvU1g5gNJyDyU+/UM/IA5kePYRxOSk1s=; b=mk7fG/72wdyhFAZWDZvb5O9GZJn+JB7CwqOk1Kskw1pMztg5TNplmyv5KO67xLIXCH Xsa1XyjiwEC8M+cH6R8rCxFWD2vSJkUY8hLffnNo5beKmiDYQ6kPZW4Gs44FQF193LDi CzKTU/9t0w7qme3s95FPxDZnTpQA6uv9D+k4kokQPlz67DXpAhH8zDPXQ333GXwaK+uY XmEQf3A9X94BmEBJ63T+99x3Sb98OfciflMlSr95VN/FsLrkZZ+IrZynPln1b1aHv9Qx JPeP3+15AJu4kNEy5zAdCAQtR9CMsb7ygAB+bn5bGZEGKpXU+tGPGqk0WUJf8FkEwj5j uOgg== X-Gm-Message-State: APt69E3gouh5F1SG402vc4mCwLt2B5Mo5VAUPiwfMw03Orfx9+oGqY+o QD00P4BnLAgYKAilGzruzGLl9A== X-Google-Smtp-Source: AAOMgpe19cra3LbGDEMTXiPBALIjET4u4AdCeAUdN3GaRhBeU0PS3dHCCBuFmn/udW5Mi0CvdE87Rw== X-Received: by 2002:a62:ce81:: with SMTP id y123-v6mr26586926pfg.95.1531239319191; Tue, 10 Jul 2018 09:15:19 -0700 (PDT) Received: from ubuntu.localdomain (c-73-162-236-45.hsd1.ca.comcast.net. [73.162.236.45]) by smtp.gmail.com with ESMTPSA id b62-v6sm81609738pfm.97.2018.07.10.09.15.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Jul 2018 09:15:17 -0700 (PDT) From: Darrell Ball To: dlu998@gmail.com, dev@openvswitch.org Date: Tue, 10 Jul 2018 09:15:09 -0700 Message-Id: <1531239309-18700-1-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 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 Subject: [ovs-dev] [patch v1] conntrack: Fix conn_update_state_alg use after free. 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 Fixes: bd5e81a0e596 ("Userspace Datapath: Add ALG infra and FTP.") Signed-off-by: Darrell Ball --- Needs backporting as far back as 2.8. lib/conntrack.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index e1c1f2e..b818584 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -1159,8 +1159,11 @@ conn_update_state_alg(struct conntrack *ct, struct dp_packet *pkt, } else { *create_new_conn = conn_update_state(ct, pkt, ctx, &conn, now, bucket); - handle_ftp_ctl(ct, ctx, pkt, conn, now, CT_FTP_CTL_OTHER, - !!nat_action_info); + + if (*create_new_conn == false) { + handle_ftp_ctl(ct, ctx, pkt, conn, now, CT_FTP_CTL_OTHER, + !!nat_action_info); + } } return true; }