From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id C9654A00E6 for ; Tue, 16 Apr 2019 16:38:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BAB041B4EA; Tue, 16 Apr 2019 16:38:51 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id ABCED1B4EA for ; Tue, 16 Apr 2019 16:38:50 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 14E143087BA9; Tue, 16 Apr 2019 14:38:50 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8EBB1001E93; Tue, 16 Apr 2019 14:38:48 +0000 (UTC) From: Kevin Traynor To: Chaitanya Babu Talluri Cc: Ferruh Yigit , Shahed Shaikh , dpdk stable Date: Tue, 16 Apr 2019 15:37:02 +0100 Message-Id: <20190416143719.21601-44-ktraynor@redhat.com> In-Reply-To: <20190416143719.21601-1-ktraynor@redhat.com> References: <20190416143719.21601-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 16 Apr 2019 14:38:50 +0000 (UTC) Subject: [dpdk-stable] patch 'drivers/net: fix possible overflow using strlcat' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/24/19. 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. Thanks. Kevin Traynor --- >From 6ebf5b652d11d578f44b2258bc3414da9b03cf9b Mon Sep 17 00:00:00 2001 From: Chaitanya Babu Talluri Date: Fri, 22 Mar 2019 07:51:42 +0000 Subject: [PATCH] drivers/net: fix possible overflow using strlcat [ upstream commit faf8c3095ac649f3d893ee846e2aa7cf1b4ccf4d ] strcat does not check the destination length and there might be chances of string overflow so instead of strcat, strlcat is used. Fixes: 540a211084a7 ("bnx2x: driver core") Fixes: e163c18a15b0 ("net/i40e: update ptype and pctype info") Signed-off-by: Chaitanya Babu Talluri Reviewed-by: Ferruh Yigit Acked-by: Shahed Shaikh --- drivers/net/bnx2x/bnx2x.c | 5 +++-- drivers/net/i40e/i40e_ethdev.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 26b3828e8..ab092e23f 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -26,4 +26,5 @@ #include #include +#include #define BNX2X_PMD_VER_PREFIX "BNX2X PMD" @@ -11742,5 +11743,5 @@ static const char *get_bnx2x_flags(uint32_t flags) for (i = 0; i < 5; i++) if (flags & (1 << i)) { - strcat(flag_str, flag[i]); + strlcat(flag_str, flag[i], sizeof(flag_str)); flags ^= (1 << i); } @@ -11748,5 +11749,5 @@ static const char *get_bnx2x_flags(uint32_t flags) static char unknown[BNX2X_INFO_STR_MAX]; snprintf(unknown, 32, "Unknown flag mask %x", flags); - strcat(flag_str, unknown); + strlcat(flag_str, unknown, sizeof(flag_str)); } return flag_str; diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 8191a6a73..63ec8136d 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -12203,6 +12203,6 @@ i40e_update_customized_pctype(struct rte_eth_dev *dev, uint8_t *pkg, if (proto[n].proto_id != proto_id) continue; - strcat(name, proto[n].name); - strcat(name, "_"); + strlcat(name, proto[n].name, sizeof(name)); + strlcat(name, "_", sizeof(name)); break; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-16 15:34:27.158407760 +0100 +++ 0044-drivers-net-fix-possible-overflow-using-strlcat.patch 2019-04-16 15:34:25.217179129 +0100 @@ -1,14 +1,15 @@ -From faf8c3095ac649f3d893ee846e2aa7cf1b4ccf4d Mon Sep 17 00:00:00 2001 +From 6ebf5b652d11d578f44b2258bc3414da9b03cf9b Mon Sep 17 00:00:00 2001 From: Chaitanya Babu Talluri Date: Fri, 22 Mar 2019 07:51:42 +0000 Subject: [PATCH] drivers/net: fix possible overflow using strlcat +[ upstream commit faf8c3095ac649f3d893ee846e2aa7cf1b4ccf4d ] + strcat does not check the destination length and there might be chances of string overflow so instead of strcat, strlcat is used. Fixes: 540a211084a7 ("bnx2x: driver core") Fixes: e163c18a15b0 ("net/i40e: update ptype and pctype info") -Cc: stable@dpdk.org Signed-off-by: Chaitanya Babu Talluri Reviewed-by: Ferruh Yigit