From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4E81CA0527 for ; Mon, 9 Nov 2020 19:45:29 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 47EC469A4; Mon, 9 Nov 2020 19:45:28 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by dpdk.org (Postfix) with ESMTP id 6999469A4 for ; Mon, 9 Nov 2020 19:45:26 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id j7so2628198wrp.3 for ; Mon, 09 Nov 2020 10:45:26 -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=POE8IlmZqVaMQkXxrr4UgEhXmNlNnP8amkn9j4Qqqv0=; b=estOeIYKVX6ObqhLUcBCzZTi/3r+k3LfmZyZzoD6dvZfvehSPglGUTEqjVWryhKD1C QrUAVVseYHvCcKfDBQtBNfdNVYoKXprutskBHz6uM3lx/7M4F8VoGfubm+4Q6IJ+spHo IxGzs5RVqbdcTUmYPAPUuMjrleBAZErX5zobQ4K7rseTPz2jjFThTTJP4rxtEGUo4Z14 2IF7PvaMIkIWfiN0Ii6raO+WxPL/2yYH9KefPBuQ4EEtcL+DjJJ9rNZhvx7MpiIvqrgo 8bWZUYRmOoVB/Lrv78Z3FNh1+8e4POqdU4fW+OWkK6xn8YOyLLZtRKHjjMHN68k5/zZx cpRg== 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=POE8IlmZqVaMQkXxrr4UgEhXmNlNnP8amkn9j4Qqqv0=; b=uAGhjLhduq0z1Uk1A6UR99UxBmzuHNZZ3MICD7Y0PwZIT2fM22ByH7qwuC+cMteCCl 30x8SNpnhhxYZDBq+ipVCMgynjdhfNuzHuJmNXDyThgj5rJDKY25dNxcoDftSOzf7/fD Yj5AL3ufUPNfuXsFdOFbbtyfrax8SvvbN1g4+iRrC9TgzSeE2SePsgbbOgX8RJH41e6N BqrYTfgx4UUn2sLLumLgF4vHeJ6qFjJHZUK19jktg79qvGtHBIk7rvq2HTxETNMQio4y SS2Q2uj46oJ1oen+nCKvMBXjdg/yjhWcwXU65ba60Yt+Cq+/hODTINsp6g7MPjibCwwm J9kg== X-Gm-Message-State: AOAM532JgQzIE0DtZCo1RT9DaWcedaVtaj/c+yk1k+di+2A+o7tQlpQq Y5yMeHjJ0soAUygFjUTxZRw= X-Google-Smtp-Source: ABdhPJyrV1HDulP1n7ukk6/APLDqqwPfcyGHn2bQHvy/SUHq6LiZwDjBAR5Ff3YK7rj/eNZIKFE1hA== X-Received: by 2002:a5d:67c5:: with SMTP id n5mr9239077wrw.179.1604947525198; Mon, 09 Nov 2020 10:45:25 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f19sm301003wml.21.2020.11.09.10.45.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:45:24 -0800 (PST) From: luca.boccassi@gmail.com To: Wei Huang Cc: Qi Zhang , dpdk stable Date: Mon, 9 Nov 2020 18:41:00 +0000 Message-Id: <20201109184111.3463090-72-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'raw/ifpga: terminate string filled by readlink with null' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/20. 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/6bf53dde34211bc779dd4d69fa02775274073309 Thanks. Luca Boccassi --- >From 6bf53dde34211bc779dd4d69fa02775274073309 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Fri, 30 Oct 2020 03:35:06 -0400 Subject: [PATCH] raw/ifpga: terminate string filled by readlink with null [ upstream commit 5a906909af93c46941bf0c56a97af8f0b279d1d4 ] readlink() does not terminate string, add a null character at the end of the string if readlink() succeeds. Coverity issue: 362820 Fixes: 9c006c45d0c5 ("raw/ifpga: scan PCIe BDF device tree") Signed-off-by: Wei Huang Acked-by: Qi Zhang --- drivers/raw/ifpga/ifpga_rawdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 7bfdde650d..05b6de6312 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -237,8 +237,9 @@ static int ifpga_rawdev_fill_info(struct ifpga_rawdev *ifpga_dev, memset(link, 0, sizeof(link)); memset(link1, 0, sizeof(link1)); ret = readlink(path, link, (sizeof(link)-1)); - if (ret == -1) + if ((ret < 0) || ((unsigned int)ret > (sizeof(link)-1))) return -1; + link[ret] = 0; /* terminate string with null character */ strlcpy(link1, link, sizeof(link1)); memset(ifpga_dev->parent_bdf, 0, 16); point = strlen(link); -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.862002456 +0000 +++ 0072-raw-ifpga-terminate-string-filled-by-readlink-with-n.patch 2020-11-09 18:40:11.215312589 +0000 @@ -1 +1 @@ -From 5a906909af93c46941bf0c56a97af8f0b279d1d4 Mon Sep 17 00:00:00 2001 +From 6bf53dde34211bc779dd4d69fa02775274073309 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5a906909af93c46941bf0c56a97af8f0b279d1d4 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 0385514cdc..f9de1677b4 100644 +index 7bfdde650d..05b6de6312 100644 @@ -23 +24 @@ -@@ -230,8 +230,9 @@ static int ifpga_rawdev_fill_info(struct ifpga_rawdev *ifpga_dev, +@@ -237,8 +237,9 @@ static int ifpga_rawdev_fill_info(struct ifpga_rawdev *ifpga_dev,