From patchwork Tue Jul 10 11:05:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 941917 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="S66QoxaS"; 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 41Pzs71GMyz9s01 for ; Tue, 10 Jul 2018 21:06:02 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 050BBD38; Tue, 10 Jul 2018 11:05:59 +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 17FBFD37 for ; Tue, 10 Jul 2018 11:05:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 68BF1334 for ; Tue, 10 Jul 2018 11:05:57 +0000 (UTC) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20180710110554euoutp01ee6f6d4146158341726f6fcfa09bfb97~--Snih-I61068510685euoutp01_; Tue, 10 Jul 2018 11:05:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180710110554euoutp01ee6f6d4146158341726f6fcfa09bfb97~--Snih-I61068510685euoutp01_ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1531220754; bh=q9NXAhHYmLaFssW8/iACOjjST4y8mCeJYhlPu1J2McA=; h=From:To:Cc:Subject:Date:References:From; b=S66QoxaSCEEOshsBjYAA3deH6qdisnzxwJ9QCGY1GEgqaHY2IJYgFE294lHpWIfuD Nudc5v2NVcuxsOGmLti0bv5koL8Pa7Biq1WAA5uH9O3ZZ2GpOqOochlKqKfqeMNkjs 2X+L/CCfJ6NICqSWXIZYb+dbSkCWJ9v6//P9kTSE= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180710110553eucas1p1cc36f562fd69aa63fb27e5708bff0c4a~--SmmTI451258712587eucas1p1s; Tue, 10 Jul 2018 11:05:53 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 98.42.17380.113944B5; Tue, 10 Jul 2018 12:05:53 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180710110552eucas1p280a3b180bb92a5aacdd76e7a1e0f2765~--SlyUeT30182101821eucas1p2_; Tue, 10 Jul 2018 11:05:52 +0000 (GMT) X-AuditID: cbfec7f4-6f9ff700000043e4-8c-5b449311f932 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id BC.A6.04178.013944B5; Tue, 10 Jul 2018 12:05:52 +0100 (BST) Received: from imaximets.rnd.samsung.ru ([106.109.129.180]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PBN00IRMDHJSS50@eusync3.samsung.com>; Tue, 10 Jul 2018 12:05:52 +0100 (BST) From: Ilya Maximets To: ovs-dev@openvswitch.org, Darrell Ball Date: Tue, 10 Jul 2018 14:05:50 +0300 Message-id: <1531220750-9384-1-git-send-email-i.maximets@samsung.com> X-Mailer: git-send-email 2.7.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnkeLIzCtJLcpLzFFi42LZduznOV3ByS7RBnPXi1q8mtzAaHF5fQer xZX2n+wWcz89Z3Rg8dg56y67x7Ob/xk9nl/rYfHo27KKMYAlissmJTUnsyy1SN8ugStj38qZ TAWz2SsWb+phaWB8ztrFyMEhIWAiseahfRcjJ4eQwApGifuzfbsYuYDsz4wSzye3soIkQGqu zXzFBpFYxiix9tJsJginmUnixLq5zCBVbAI6EqdWH2EEmSoiYCNx4UMGSJhZwFli28UZjCC2 sICjxIrt21hAbBYBVYkV0xaD2bwCrhL/GjrYIZbJSdw818kMMl9C4CKrxLrtC9ggEi4S865d YISwhSVeHd8C1SAj0dlxkAnCrpe43/KSEaK5g1Fi+qF/UAl7iS2vz7FDXMQnMWnbdGaI93kl OtqEIEo8JI7smssKCYpYif2vJjFPYJRYwMiwilE8tbQ4Nz212CgvtVyvODG3uDQvXS85P3cT IzB6Tv87/mUH464/SYcYBTgYlXh4OTKco4VYE8uKK3MPMUpwMCuJ8Eb2ukQL8aYkVlalFuXH F5XmpBYfYpTmYFES543TqIsSEkhPLEnNTk0tSC2CyTJxcEo1MC6b/vD3RNOqFMlCecaOa307 Oo94GP5ljX3uMK288w7H9BKdQ5NXuvIk7FS5dVXZpd/UdEuv5Ov0yrmhnWknY8xtbtc2PJiy nX3TyVOvBFamvK/9OkdEsF1ZbZrShN0304sOXfp0SeHBs5ulZwM7tNJf1H4IcJ95UHnihDO2 Ga+OPwsrEXp5WlqJpTgj0VCLuag4EQBToaxfmgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFJMWRmVeSWpSXmKPExsVy+t/xq7oCk12iDX7061m8mtzAaHF5fQer xZX2n+wWcz89Z3Rg8dg56y67x7Ob/xk9nl/rYfHo27KKMYAlissmJTUnsyy1SN8ugStj38qZ TAWz2SsWb+phaWB8ztrFyMkhIWAicW3mKzYQW0hgCaPE+TXxXYxcQHYrk8S7Cw/BitgEdCRO rT7C2MXIwSEiYCNx4UMGSJhZwFli28UZjCC2sICjxIrt21hAbBYBVYkV0xaD2bwCrhL/GjrY IXbJSdw818k8gZFrASPDKkaR1NLi3PTcYkO94sTc4tK8dL3k/NxNjEAfbzv2c/MOxksbgw8x CnAwKvHwbkh1jhZiTSwrrsw9xCjBwawkwhvZ6xItxJuSWFmVWpQfX1Sak1p8iFGag0VJnPe8 QWWUkEB6YklqdmpqQWoRTJaJg1OqgXH6mveP4mRyq2/4W5/ST09p+HYsxJVN4Unek1c/10eX B2zVvnv58tnDgc7/4lecMOBJ37/r34LdtTsrJXp4UjW0omNcnViLTJrsHyV/6X15797p102T e8PtLLbsSytTWmzzwHxeB+ddVbvwVOMO3dadfs5M0x5zpt9rvvr0ud53O5W3G2cU8SqxFGck GmoxFxUnAgAwRaqc7QEAAA== X-CMS-MailID: 20180710110552eucas1p280a3b180bb92a5aacdd76e7a1e0f2765 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180710110552eucas1p280a3b180bb92a5aacdd76e7a1e0f2765 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] conntrack: Fix using alg_exp_entry out of scope. 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 'alg_exp_entry' is allocated on stack memory, but could be used via 'alg_exp' pointer inside 'write_ct_md' function, i.e. outside its scope. CC: Darrell Ball Fixes: bd5e81a0e596 ("Userspace Datapath: Add ALG infra and FTP.") Signed-off-by: Ilya Maximets Acked-by: Darrell Ball --- lib/conntrack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index 97fd46a..51c1acb 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -1246,9 +1246,9 @@ process_one(struct conntrack *ct, struct dp_packet *pkt, } const struct alg_exp_node *alg_exp = NULL; + struct alg_exp_node alg_exp_entry; if (OVS_UNLIKELY(create_new_conn)) { - struct alg_exp_node alg_exp_entry; ct_rwlock_rdlock(&ct->resources_lock); alg_exp = expectation_lookup(&ct->alg_expectations, &ctx->key,