From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 420811B104 for ; Wed, 21 Nov 2018 17:05:50 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A3F353001FE3; Wed, 21 Nov 2018 16:05:49 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 948A1608E7; Wed, 21 Nov 2018 16:05:48 +0000 (UTC) From: Kevin Traynor To: Martin Harvey Cc: Andrew Rybchenko , dpdk stable Date: Wed, 21 Nov 2018 16:03:53 +0000 Message-Id: <20181121160440.9014-3-ktraynor@redhat.com> In-Reply-To: <20181121160440.9014-1-ktraynor@redhat.com> References: <20181121160440.9014-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 21 Nov 2018 16:05:49 +0000 (UTC) Subject: [dpdk-stable] patch 'net/sfc/base: fix output buffer SAL annotation' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Wed, 21 Nov 2018 16:05:50 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 11/26/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 5635e1b16181768ae30ffee0c6b8ed3aee200c42 Mon Sep 17 00:00:00 2001 From: Martin Harvey Date: Mon, 10 Sep 2018 10:33:02 +0100 Subject: [PATCH] net/sfc/base: fix output buffer SAL annotation [ upstream commit a8fb089398ae5c7df554e3a72927cd202de30594 ] Found by PreFAST warnings. Fixes: 3f2f0189dd44 ("net/sfc/base: add signed image layout support") Signed-off-by: Martin Harvey Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/ef10_image.c | 3 ++- drivers/net/sfc/base/efx.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/base/ef10_image.c b/drivers/net/sfc/base/ef10_image.c index 0d8898762..c035e0df6 100644 --- a/drivers/net/sfc/base/ef10_image.c +++ b/drivers/net/sfc/base/ef10_image.c @@ -578,5 +578,6 @@ fail1: __checkReturn efx_rc_t efx_build_signed_image_write_buffer( - __out uint8_t *bufferp, + __out_bcount(buffer_size) + uint8_t *bufferp, __in uint32_t buffer_size, __in efx_image_info_t *infop, diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h index 5108b9b1f..53cbc9858 100644 --- a/drivers/net/sfc/base/efx.h +++ b/drivers/net/sfc/base/efx.h @@ -1690,5 +1690,6 @@ efx_check_reflash_image( extern __checkReturn efx_rc_t efx_build_signed_image_write_buffer( - __out uint8_t *bufferp, + __out_bcount(buffer_size) + uint8_t *bufferp, __in uint32_t buffer_size, __in efx_image_info_t *infop, -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 15:59:13.701449853 +0000 +++ 0003-net-sfc-base-fix-output-buffer-SAL-annotation.patch 2018-11-21 15:59:13.000000000 +0000 @@ -1,12 +1,13 @@ -From a8fb089398ae5c7df554e3a72927cd202de30594 Mon Sep 17 00:00:00 2001 +From 5635e1b16181768ae30ffee0c6b8ed3aee200c42 Mon Sep 17 00:00:00 2001 From: Martin Harvey Date: Mon, 10 Sep 2018 10:33:02 +0100 Subject: [PATCH] net/sfc/base: fix output buffer SAL annotation +[ upstream commit a8fb089398ae5c7df554e3a72927cd202de30594 ] + Found by PreFAST warnings. Fixes: 3f2f0189dd44 ("net/sfc/base: add signed image layout support") -Cc: stable@dpdk.org Signed-off-by: Martin Harvey Signed-off-by: Andrew Rybchenko