| From a6c0df7eb94f5ff2e5fd4789310a4eaf40fe8ca2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 19 Mar 2020 18:33:12 -0400 |
| Subject: tools/power turbostat: Fix gcc build warnings |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Len Brown <len.brown@intel.com> |
| |
| [ Upstream commit d8d005ba6afa502ca37ced5782f672c4d2fc1515 ] |
| |
| Warning: ‘__builtin_strncpy’ specified bound 20 equals destination size |
| [-Wstringop-truncation] |
| |
| reduce param to strncpy, to guarantee that a null byte is always copied |
| into destination buffer. |
| |
| Signed-off-by: Len Brown <len.brown@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/power/x86/turbostat/turbostat.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c |
| index 5d0fddda842c4..78507cd479bb4 100644 |
| --- a/tools/power/x86/turbostat/turbostat.c |
| +++ b/tools/power/x86/turbostat/turbostat.c |
| @@ -5323,9 +5323,9 @@ int add_counter(unsigned int msr_num, char *path, char *name, |
| } |
| |
| msrp->msr_num = msr_num; |
| - strncpy(msrp->name, name, NAME_BYTES); |
| + strncpy(msrp->name, name, NAME_BYTES - 1); |
| if (path) |
| - strncpy(msrp->path, path, PATH_BYTES); |
| + strncpy(msrp->path, path, PATH_BYTES - 1); |
| msrp->width = width; |
| msrp->type = type; |
| msrp->format = format; |
| -- |
| 2.20.1 |
| |
