From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A7FE9A0C47 for ; Tue, 10 Aug 2021 17:43:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A2E734114F; Tue, 10 Aug 2021 17:43:45 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id D31CF411C6 for ; Tue, 10 Aug 2021 17:43:43 +0200 (CEST) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id B8D113F107 for ; Tue, 10 Aug 2021 15:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610223; bh=E3Z/krR6n1RFAGbneCKXUq8P0M/tmIksDx4H200Iq0M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tQc8g+K/SNEmOLcRbbbvxiDux1JY1Gg2BPoKc4E+vCSwfaCPN8H7CE7cJMIN3Av8k 9O0y7B4qpCfcLUexRc1k0CogyPuUBQLAAZnYOIbO5QRjvcX/r9hlocLaBN5kUcAYt0 VXEmhHQDxcVopibNyNhq3ullVq/4mE2BGmDkmVWbavbHod5155Hysg4faLUAFgcV6C grPPbYQfGYo4VyFMtobW9P/EsP6giC4ZNHluVY+xz8bbesOQu4CAf+IPuMQI5ViWTZ 3r/3w36cSfgA2zAyw9dNcfgFC4hj/JqAi4pvJosSktWcjwztPpR/6svmsd9CPFOVc/ m1G9JzT6IJieQ== Received: by mail-ej1-f72.google.com with SMTP id q19-20020a170906b293b029058a1e75c819so5715411ejz.16 for ; Tue, 10 Aug 2021 08:43:43 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=E3Z/krR6n1RFAGbneCKXUq8P0M/tmIksDx4H200Iq0M=; b=bhCk2VkV+FDVv7IPHd5WXXqj5U7QA6mYo1mdUlBB8ZAZyLeB5SBTBst7HCSH8qrk2W sWAKb144c4dGrhdzsTzclU4JaDYI5T488hRCzgb2wpkXCQ2hPewVel8Vz2FZVylii2pR ivP6q2l/JXLgpT7LRAc6hU0zCkiRc42pl/VyN4rbtEzwch+GQSy8CwyIHTJiwiubydT8 bn7mpz2cMSY9ZtJRQMDaXKkYzRPUvl3W73P7c4DUWLNrXyZrnmcbJFcFPD2NCcp/vVXw IewRYpuhmV+vlI7DjM7l11eOmHs7ryWPn+8IPmtKkHWsDdwZCHfPUMfD5QdDntYs5cmu T7xw== X-Gm-Message-State: AOAM531UvKwfhLb966IVai9czXWDhLxKfjxEFlx175qa9USTbI62vyWm vJBrd5/qzQr2YS+YWOJeAP6sf9w1EF992M6jIEl1ASySsxXZcteHDfvjZprL7pk0qiFzWgvj0JA gLxJOOkZIP9n7zoEtmtQ9L4Jc X-Received: by 2002:a17:906:9515:: with SMTP id u21mr745617ejx.120.1628610223268; Tue, 10 Aug 2021 08:43:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuiMzkRtB9pS6f94gtcxWcDBgthpmZMzSzeqRgF8vcp2jyCO5MzDj/azcBlbTP2YEQ0Kx3uQ== X-Received: by 2002:a17:906:9515:: with SMTP id u21mr745594ejx.120.1628610222917; Tue, 10 Aug 2021 08:43:42 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id dh8sm9664476edb.14.2021.08.10.08.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:43:42 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Dapeng Yu Cc: Andrew Rybchenko , dpdk stable Date: Tue, 10 Aug 2021 17:39:44 +0200 Message-Id: <20210810154022.749358-64-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/softnic: fix connection memory leak' has been queued to stable release 19.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/c9bf6d0d074891cd6b5d5932a1b43254c143f6c8 Thanks. Christian Ehrhardt --- >From c9bf6d0d074891cd6b5d5932a1b43254c143f6c8 Mon Sep 17 00:00:00 2001 From: Dapeng Yu Date: Fri, 9 Jul 2021 14:00:56 +0800 Subject: [PATCH] net/softnic: fix connection memory leak [ upstream commit ae2b3ba6430d9f86cc3583b893f442aaa8934655 ] In function softnic_conn_init(), a block of memory is allocated as connection buffer, but it is never freed in softnic_conn_free(), which cause memory leak. Fixes: 7709a63bf178 ("net/softnic: add connection agent") Signed-off-by: Dapeng Yu Reviewed-by: Andrew Rybchenko --- drivers/net/softnic/conn.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/softnic/conn.c b/drivers/net/softnic/conn.c index 8b66580887..5b031358d5 100644 --- a/drivers/net/softnic/conn.c +++ b/drivers/net/softnic/conn.c @@ -144,6 +144,7 @@ softnic_conn_free(struct softnic_conn *conn) free(conn->msg_out); free(conn->msg_in); + free(conn->buf); free(conn->prompt); free(conn->welcome); free(conn); -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.511211519 +0200 +++ 0064-net-softnic-fix-connection-memory-leak.patch 2021-08-10 15:11:13.062638416 +0200 @@ -1 +1 @@ -From ae2b3ba6430d9f86cc3583b893f442aaa8934655 Mon Sep 17 00:00:00 2001 +From c9bf6d0d074891cd6b5d5932a1b43254c143f6c8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ae2b3ba6430d9f86cc3583b893f442aaa8934655 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org