diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2023-01-31 19:50:25 +0100 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2023-02-06 11:13:53 +0100 |
| commit | 03d4907396f30d1fbe37b67f16eaba9f0b6c3702 (patch) | |
| tree | e5d7e2fe4565224cb0735c3c7e3c28df7794bdbe /drivers | |
| parent | 6bb361d5d8eb1dbc9e0b190eeee27a2ac4d1119f (diff) | |
| download | linux-stable-03d4907396f30d1fbe37b67f16eaba9f0b6c3702.tar.gz linux-stable-03d4907396f30d1fbe37b67f16eaba9f0b6c3702.tar.bz2 linux-stable-03d4907396f30d1fbe37b67f16eaba9f0b6c3702.zip | |
s390/hmcdrv: use strscpy() instead of strlcpy()
Given that strlcpy() is deprecated use strscpy() instead.
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/char/diag_ftp.c | 4 | ||||
| -rw-r--r-- | drivers/s390/char/sclp_ftp.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/char/diag_ftp.c b/drivers/s390/char/diag_ftp.c index 36bbd6b6e210..65c7f2d565d8 100644 --- a/drivers/s390/char/diag_ftp.c +++ b/drivers/s390/char/diag_ftp.c @@ -159,8 +159,8 @@ ssize_t diag_ftp_cmd(const struct hmcdrv_ftp_cmdspec *ftp, size_t *fsize) goto out; } - len = strlcpy(ldfpl->fident, ftp->fname, sizeof(ldfpl->fident)); - if (len >= HMCDRV_FTP_FIDENT_MAX) { + len = strscpy(ldfpl->fident, ftp->fname, sizeof(ldfpl->fident)); + if (len < 0) { len = -EINVAL; goto out_free; } diff --git a/drivers/s390/char/sclp_ftp.c b/drivers/s390/char/sclp_ftp.c index ec5a0e2b9255..d27e2cbfbccb 100644 --- a/drivers/s390/char/sclp_ftp.c +++ b/drivers/s390/char/sclp_ftp.c @@ -90,7 +90,7 @@ static int sclp_ftp_et7(const struct hmcdrv_ftp_cmdspec *ftp) struct completion completion; struct sclp_diag_sccb *sccb; struct sclp_req *req; - size_t len; + ssize_t len; int rc; req = kzalloc(sizeof(*req), GFP_KERNEL); @@ -117,9 +117,9 @@ static int sclp_ftp_et7(const struct hmcdrv_ftp_cmdspec *ftp) sccb->evbuf.mdd.ftp.length = ftp->len; sccb->evbuf.mdd.ftp.bufaddr = virt_to_phys(ftp->buf); - len = strlcpy(sccb->evbuf.mdd.ftp.fident, ftp->fname, + len = strscpy(sccb->evbuf.mdd.ftp.fident, ftp->fname, HMCDRV_FTP_FIDENT_MAX); - if (len >= HMCDRV_FTP_FIDENT_MAX) { + if (len < 0) { rc = -EINVAL; goto out_free; } |