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 206F2A0524 for ; Fri, 5 Feb 2021 12:36:16 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E9924067B; Fri, 5 Feb 2021 12:36:16 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id E58C94067B for ; Fri, 5 Feb 2021 12:36:14 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id o10so7687039wmc.1 for ; Fri, 05 Feb 2021 03:36:14 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=32YV/+6jynKDAjHA1bsG1yINk4n9HGacBhKk52bCyF8=; b=IxXZ+rh2zmEvP7aVncdOTcniAYjPo+upGB6rSsgZKDvYAVhLYI8vZZHSYp4HLAFQxf 4HsexDuqrZHsWejq4tXbsW0W8htVNHmERtpiaWG9JxJYeJ73nYZtXxM6N4erI0NTnoJR ZT6esfOImvQsseuxcrP3KWyFUr8wFaEk/vxduU2ayGS0sH+iHXtei5dSu72uN75CKsne D5tTHdWwLsQMJujnbEqqPCmsz4ZuULo7dXLgSNaumKJhb1I0nQH+JQ3a/TmfSDAd2KMb MTrUyxLYpwmkpc4KzurT7gtwydnqJ7EQtY4EVl2VW5sVnHnB9p7QbNdFVQ3Dr+zTy7qI To6w== 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=32YV/+6jynKDAjHA1bsG1yINk4n9HGacBhKk52bCyF8=; b=iFBsShUyX/U5LQ8lHyTc/o2tW4rgxLTC0HHJYYcbROFAycUAjJtKXdVyQU132Y6/BB mcKbnIdHke8E4xaiD8bTMekAaJFutKwT9I0jTmd0IoI0OjBs53x4a+Fri4gkrXz7PPm0 1jEh+MckcRcx/7a/hregYMbCcIAl0KXid8HVYQv5i80KUDxJiS8X4rtlyDZsECYuhtbg KPHwA3HIKGITs6Me09Xl+1lqZq9QBradf1m8IHzP7MupI2BDrSURz1JZpcNDCGErpft2 bwOG3JJrL88OIs2ufMe3Os41U25qHK1pKhhP5BsBU9FZA0CKKA/ipzhBrebvJQB1B/e3 F2YA== X-Gm-Message-State: AOAM532nYBhXrk+YebSwwO/phQk3WJXV/PcfCILOLcGZ7XInJ5ZRM7S7 ZC/z+1hnYB+vldlNwfz4gklA6qMq8PoV/bcj X-Google-Smtp-Source: ABdhPJxDi16aluWngcFosNLuEi/mXJni6R+WWbjcYv54DCuvlccTF7k9m0qzulRN/9bZ730oyoT1GQ== X-Received: by 2002:a1c:2b05:: with SMTP id r5mr3193390wmr.179.1612524974721; Fri, 05 Feb 2021 03:36:14 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o13sm5168312wmh.2.2021.02.05.03.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:36:14 -0800 (PST) From: luca.boccassi@gmail.com To: Cristian Dumitrescu Cc: dpdk stable Date: Fri, 5 Feb 2021 11:18:12 +0000 Message-Id: <20210205111920.1272063-206-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/pipeline: fix CLI parsing crash' has been queued to stable release 20.11.1 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 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/70f2333c51d6042541fa233ff2693cf7472c5693 Thanks. Luca Boccassi --- >From 70f2333c51d6042541fa233ff2693cf7472c5693 Mon Sep 17 00:00:00 2001 From: Cristian Dumitrescu Date: Thu, 28 Jan 2021 19:12:39 +0000 Subject: [PATCH] examples/pipeline: fix CLI parsing crash [ upstream commit 821848f5192c6b6be954fa9f04c0e6a470cff2b6 ] Cannot dereference pointer for token[1] unless valid. Fixes: 5074e1d551 ("examples/pipeline: add configuration commands") Signed-off-by: Cristian Dumitrescu --- examples/pipeline/cli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c index d0150cfcf6..e97e120606 100644 --- a/examples/pipeline/cli.c +++ b/examples/pipeline/cli.c @@ -1294,7 +1294,7 @@ cli_process(char *in, char *out, size_t out_size, void *obj) } if (strcmp(tokens[0], "link") == 0) { - if (strcmp(tokens[1], "show") == 0) { + if ((n_tokens >= 2) && (strcmp(tokens[1], "show") == 0)) { cmd_link_show(tokens, n_tokens, out, out_size, obj); return; } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:38.343283840 +0000 +++ 0206-examples-pipeline-fix-CLI-parsing-crash.patch 2021-02-05 11:18:29.166697965 +0000 @@ -1 +1 @@ -From 821848f5192c6b6be954fa9f04c0e6a470cff2b6 Mon Sep 17 00:00:00 2001 +From 70f2333c51d6042541fa233ff2693cf7472c5693 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 821848f5192c6b6be954fa9f04c0e6a470cff2b6 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org