Commit 28c620c6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Kleber Sacilotto de Souza

ncpfs: fix build warning of strncpy

BugLink: https://bugs.launchpad.net/bugs/1822271

Not upstream as ncpfs is long deleted.

Fix up two strncpy build warnings in ncp_get_charsets() by using strscpy
and the max size of the array.

It's not like anyone uses this code anyway, and this gets rid of two
build warnings so that we can see real warnings as they pop up over
time.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarJuerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 3e0ec526
...@@ -233,7 +233,7 @@ ncp_get_charsets(struct ncp_server* server, struct ncp_nls_ioctl __user *arg) ...@@ -233,7 +233,7 @@ ncp_get_charsets(struct ncp_server* server, struct ncp_nls_ioctl __user *arg)
len = strlen(server->nls_vol->charset); len = strlen(server->nls_vol->charset);
if (len > NCP_IOCSNAME_LEN) if (len > NCP_IOCSNAME_LEN)
len = NCP_IOCSNAME_LEN; len = NCP_IOCSNAME_LEN;
strncpy(user.codepage, server->nls_vol->charset, len); strscpy(user.codepage, server->nls_vol->charset, NCP_IOCSNAME_LEN);
user.codepage[len] = 0; user.codepage[len] = 0;
} }
...@@ -243,7 +243,7 @@ ncp_get_charsets(struct ncp_server* server, struct ncp_nls_ioctl __user *arg) ...@@ -243,7 +243,7 @@ ncp_get_charsets(struct ncp_server* server, struct ncp_nls_ioctl __user *arg)
len = strlen(server->nls_io->charset); len = strlen(server->nls_io->charset);
if (len > NCP_IOCSNAME_LEN) if (len > NCP_IOCSNAME_LEN)
len = NCP_IOCSNAME_LEN; len = NCP_IOCSNAME_LEN;
strncpy(user.iocharset, server->nls_io->charset, len); strscpy(user.iocharset, server->nls_io->charset, NCP_IOCSNAME_LEN);
user.iocharset[len] = 0; user.iocharset[len] = 0;
} }
mutex_unlock(&server->root_setup_lock); mutex_unlock(&server->root_setup_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment