merged into cifs-2.6.git for-next
On Fri, Feb 8, 2019 at 5:49 PM Ronnie Sahlberg <lsahlber@xxxxxxxxxx> wrote:
>
> Signed-off-by: Ronnie Sahlberg <lsahlber@xxxxxxxxxx>
> ---
> fs/cifs/cifsacl.c | 2 +-
> fs/cifs/cifssmb.c | 6 +++---
> fs/cifs/connect.c | 6 +++---
> fs/cifs/link.c | 14 +++++++-------
> fs/cifs/smb2pdu.c | 6 +++---
> fs/cifs/smbdirect.c | 6 +++---
> 6 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
> index 1d377b7f2860..246dcade5503 100644
> --- a/fs/cifs/cifsacl.c
> +++ b/fs/cifs/cifsacl.c
> @@ -291,7 +291,7 @@ id_to_sid(unsigned int cid, uint sidtype, struct cifs_sid *ssid)
> char desc[3 + 10 + 1]; /* 3 byte prefix + 10 bytes for value + NULL */
> const struct cred *saved_cred;
>
> - rc = snprintf(desc, sizeof(desc), "%ci:%u",
> + rc = scnprintf(desc, sizeof(desc), "%ci:%u",
> sidtype == SIDOWNER ? 'o' : 'g', cid);
> if (rc >= sizeof(desc))
> return -EINVAL;
> diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
> index c0e3a04390c1..f43747c062a7 100644
> --- a/fs/cifs/cifssmb.c
> +++ b/fs/cifs/cifssmb.c
> @@ -139,8 +139,8 @@ static int __cifs_reconnect_tcon(const struct nls_table *nlsc,
> return -ENOMEM;
>
> if (tcon->ipc) {
> - snprintf(tree, MAX_TREE_SIZE, "\\\\%s\\IPC$",
> - tcon->ses->server->hostname);
> + scnprintf(tree, MAX_TREE_SIZE, "\\\\%s\\IPC$",
> + tcon->ses->server->hostname);
> rc = CIFSTCon(0, tcon->ses, tree, tcon, nlsc);
> goto out;
> }
> @@ -172,7 +172,7 @@ static int __cifs_reconnect_tcon(const struct nls_table *nlsc,
> continue;
> }
>
> - snprintf(tree, MAX_TREE_SIZE, "\\%s", tgt);
> + scnprintf(tree, MAX_TREE_SIZE, "\\%s", tgt);
>
> rc = CIFSTCon(0, tcon->ses, tree, tcon, nlsc);
> if (!rc)
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index a659944734f4..b840d7b407f0 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -348,7 +348,7 @@ static int reconn_set_ipaddr(struct TCP_Server_Info *server)
> cifs_dbg(FYI, "%s: failed to create UNC path\n", __func__);
> return -ENOMEM;
> }
> - snprintf(unc, len, "\\\\%s", server->hostname);
> + scnprintf(unc, len, "\\\\%s", server->hostname);
>
> rc = dns_resolve_server_name_to_ip(unc, &ipaddr);
> kfree(unc);
> @@ -2776,7 +2776,7 @@ cifs_setup_ipc(struct cifs_ses *ses, struct smb_vol *volume_info)
> if (tcon == NULL)
> return -ENOMEM;
>
> - snprintf(unc, sizeof(unc), "\\\\%s\\IPC$", ses->server->hostname);
> + scnprintf(unc, sizeof(unc), "\\\\%s\\IPC$", ses->server->hostname);
>
> /* cannot fail */
> nls_codepage = load_nls_default();
> @@ -4204,7 +4204,7 @@ static int update_vol_info(const struct dfs_cache_tgt_iterator *tgt_it,
> new_unc = kmalloc(len, GFP_KERNEL);
> if (!new_unc)
> return -ENOMEM;
> - snprintf(new_unc, len, "\\%s", tgt);
> + scnprintf(new_unc, len, "\\%s", tgt);
>
> kfree(vol->UNC);
> vol->UNC = new_unc;
> diff --git a/fs/cifs/link.c b/fs/cifs/link.c
> index 2148b0f60e5e..62216dc8f9f5 100644
> --- a/fs/cifs/link.c
> +++ b/fs/cifs/link.c
> @@ -103,9 +103,9 @@ parse_mf_symlink(const u8 *buf, unsigned int buf_len, unsigned int *_link_len,
> return rc;
> }
>
> - snprintf(md5_str2, sizeof(md5_str2),
> - CIFS_MF_SYMLINK_MD5_FORMAT,
> - CIFS_MF_SYMLINK_MD5_ARGS(md5_hash));
> + scnprintf(md5_str2, sizeof(md5_str2),
> + CIFS_MF_SYMLINK_MD5_FORMAT,
> + CIFS_MF_SYMLINK_MD5_ARGS(md5_hash));
>
> if (strncmp(md5_str1, md5_str2, 17) != 0)
> return -EINVAL;
> @@ -142,10 +142,10 @@ format_mf_symlink(u8 *buf, unsigned int buf_len, const char *link_str)
> return rc;
> }
>
> - snprintf(buf, buf_len,
> - CIFS_MF_SYMLINK_LEN_FORMAT CIFS_MF_SYMLINK_MD5_FORMAT,
> - link_len,
> - CIFS_MF_SYMLINK_MD5_ARGS(md5_hash));
> + scnprintf(buf, buf_len,
> + CIFS_MF_SYMLINK_LEN_FORMAT CIFS_MF_SYMLINK_MD5_FORMAT,
> + link_len,
> + CIFS_MF_SYMLINK_MD5_ARGS(md5_hash));
>
> ofs = CIFS_MF_SYMLINK_LINK_OFFSET;
> memcpy(buf + ofs, link_str, link_len);
> diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
> index 54181387a770..e3f0775f9765 100644
> --- a/fs/cifs/smb2pdu.c
> +++ b/fs/cifs/smb2pdu.c
> @@ -173,8 +173,8 @@ static int __smb2_reconnect(const struct nls_table *nlsc,
> return -ENOMEM;
>
> if (tcon->ipc) {
> - snprintf(tree, MAX_TREE_SIZE, "\\\\%s\\IPC$",
> - tcon->ses->server->hostname);
> + scnprintf(tree, MAX_TREE_SIZE, "\\\\%s\\IPC$",
> + tcon->ses->server->hostname);
> rc = SMB2_tcon(0, tcon->ses, tree, tcon, nlsc);
> goto out;
> }
> @@ -206,7 +206,7 @@ static int __smb2_reconnect(const struct nls_table *nlsc,
> continue;
> }
>
> - snprintf(tree, MAX_TREE_SIZE, "\\%s", tgt);
> + scnprintf(tree, MAX_TREE_SIZE, "\\%s", tgt);
>
> rc = SMB2_tcon(0, tcon->ses, tree, tcon, nlsc);
> if (!rc)
> diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
> index a568dac7b3a1..b943b74cd246 100644
> --- a/fs/cifs/smbdirect.c
> +++ b/fs/cifs/smbdirect.c
> @@ -1550,7 +1550,7 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)
> char name[MAX_NAME_LEN];
> int rc;
>
> - snprintf(name, MAX_NAME_LEN, "smbd_request_%p", info);
> + scnprintf(name, MAX_NAME_LEN, "smbd_request_%p", info);
> info->request_cache =
> kmem_cache_create(
> name,
> @@ -1566,7 +1566,7 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)
> if (!info->request_mempool)
> goto out1;
>
> - snprintf(name, MAX_NAME_LEN, "smbd_response_%p", info);
> + scnprintf(name, MAX_NAME_LEN, "smbd_response_%p", info);
> info->response_cache =
> kmem_cache_create(
> name,
> @@ -1582,7 +1582,7 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)
> if (!info->response_mempool)
> goto out3;
>
> - snprintf(name, MAX_NAME_LEN, "smbd_%p", info);
> + scnprintf(name, MAX_NAME_LEN, "smbd_%p", info);
> info->workqueue = create_workqueue(name);
> if (!info->workqueue)
> goto out4;
> --
> 2.13.6
>
--
Thanks,
Steve
