2014-07-26 14:34:03

by Rickard Strandqvist

Subject: [PATCH] s390: net: qeth_core_main.c: Cleaning up missing null-terminate in conjunction with strncpy

Replacing strncpy with strlcpy to avoid strings that lacks null terminate.

Signed-off-by: Rickard Strandqvist <[email protected]>
---
drivers/s390/net/qeth_core_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index f54bec5..ec9b4d7 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -5275,7 +5275,7 @@ static int qeth_add_dbf_entry(struct qeth_card *card, char *name)
new_entry = kzalloc(sizeof(struct qeth_dbf_entry), GFP_KERNEL);
if (!new_entry)
goto err_dbg;
- strncpy(new_entry->dbf_name, name, DBF_NAME_LEN);
+ strlcpy(new_entry->dbf_name, name, DBF_NAME_LEN);
new_entry->dbf_info = card->debug;
mutex_lock(&qeth_dbf_list_mutex);
list_add(&new_entry->dbf_list, &qeth_dbf_list);
--
1.7.10.4

2014-07-29 13:13:54

by Ursula Braun

Subject: Re: [PATCH] s390: net: qeth_core_main.c: Cleaning up missing null-terminate in conjunction with strncpy

On Sat, 2014-07-26 at 16:35 +0200, Rickard Strandqvist wrote:
> Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
>
> Signed-off-by: Rickard Strandqvist <[email protected]>
> ---
> drivers/s390/net/qeth_core_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
> index f54bec5..ec9b4d7 100644
> --- a/drivers/s390/net/qeth_core_main.c
> +++ b/drivers/s390/net/qeth_core_main.c
> @@ -5275,7 +5275,7 @@ static int qeth_add_dbf_entry(struct qeth_card *card, char *name)
> new_entry = kzalloc(sizeof(struct qeth_dbf_entry), GFP_KERNEL);
> if (!new_entry)
> goto err_dbg;
> - strncpy(new_entry->dbf_name, name, DBF_NAME_LEN);
> + strlcpy(new_entry->dbf_name, name, DBF_NAME_LEN);
> new_entry->dbf_info = card->debug;
> mutex_lock(&qeth_dbf_list_mutex);
> list_add(&new_entry->dbf_list, &qeth_dbf_list);

It is guaranteed that the string ch->id always fits into DBF_NAME_LEN.
What's in this case the benefit of replacing strncpy() by strlcpy()
here?