2018-01-08 12:44:04

by Xiongfeng Wang

Subject: [PATCH] scsi: mptfusion: use strlcpy() instead of strncpy()

From: Xiongfeng Wang <[email protected]>

gcc-8 reports

drivers/message/fusion/mptbase.c: In function 'mpt_display_event_info':
./include/linux/string.h:245:9: warning: '__builtin_strncpy' specified
bound 100 equals destination size [-Wstringop-truncation]

We need to use strlcpy() to make sure the dest string is
nul-terminated.

Signed-off-by: Xiongfeng Wang <[email protected]>
---
drivers/message/fusion/mptbase.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 7a93400..3c47888 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -7697,7 +7697,7 @@ static void seq_mpt_print_ioc_summary(MPT_ADAPTER *ioc, struct seq_file *m, int
break;
}
if (ds)
- strncpy(evStr, ds, EVENT_DESCR_STR_SZ);
+ strlcpy(evStr, ds, EVENT_DESCR_STR_SZ);


devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT
--
1.8.3.1

2018-01-08 16:43:05

by Arnd Bergmann

Subject: Re: [PATCH] scsi: mptfusion: use strlcpy() instead of strncpy()

On Mon, Jan 8, 2018 at 1:49 PM, Xiongfeng Wang
<[email protected]> wrote:
> From: Xiongfeng Wang <[email protected]>
>
> gcc-8 reports
>
> drivers/message/fusion/mptbase.c: In function 'mpt_display_event_info':
> ./include/linux/string.h:245:9: warning: '__builtin_strncpy' specified
> bound 100 equals destination size [-Wstringop-truncation]
>
> We need to use strlcpy() to make sure the dest string is
> nul-terminated.
>
> Signed-off-by: Xiongfeng Wang <[email protected]>

Looks correct to me,

Acked-by: Arnd Bergmann <[email protected]>

2018-01-09 02:55:00

by Martin K. Petersen

Subject: Re: [PATCH] scsi: mptfusion: use strlcpy() instead of strncpy()

Xiongfeng,

> gcc-8 reports
>
> drivers/message/fusion/mptbase.c: In function 'mpt_display_event_info':
> ./include/linux/string.h:245:9: warning: '__builtin_strncpy' specified
> bound 100 equals destination size [-Wstringop-truncation]
>
> We need to use strlcpy() to make sure the dest string is
> nul-terminated.

Applied to 4.16/scsi-queue. Thanks!

--
Martin K. Petersen Oracle Linux Engineering