[dpdk-stable] patch 'net/sfc/base: fix output buffer SAL annotation' has been queued to stable release 18.08.1

[Kevin Traynor]

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 <mharvey at solarflare.com>
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 <mharvey at solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 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 <mharvey at solarflare.com>
 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 at dpdk.org
 
 Signed-off-by: Martin Harvey <mharvey at solarflare.com>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>