summaryrefslogtreecommitdiffstats
path: root/module/zfs
diff options
context:
space:
mode:
Diffstat (limited to 'module/zfs')
-rw-r--r--module/zfs/ddt.c2
-rw-r--r--module/zfs/dmu_objset.c11
-rw-r--r--module/zfs/dmu_send.c3
-rw-r--r--module/zfs/dsl_dataset.c14
-rw-r--r--module/zfs/dsl_dir.c5
-rw-r--r--module/zfs/dsl_prop.c10
-rw-r--r--module/zfs/dsl_scan.c2
-rw-r--r--module/zfs/dsl_userhold.c6
-rw-r--r--module/zfs/spa.c4
-rw-r--r--module/zfs/zap.c2
-rw-r--r--module/zfs/zap_micro.c3
-rw-r--r--module/zfs/zcp_get.c18
-rw-r--r--module/zfs/zfs_fuid.c4
-rw-r--r--module/zfs/zfs_ioctl.c5
-rw-r--r--module/zfs/zfs_quota.c12
-rw-r--r--module/zfs/zio.c6
16 files changed, 62 insertions, 45 deletions
diff --git a/module/zfs/ddt.c b/module/zfs/ddt.c
index 5dcb36ce6..33dad8bdf 100644
--- a/module/zfs/ddt.c
+++ b/module/zfs/ddt.c
@@ -253,7 +253,7 @@ void
ddt_object_name(ddt_t *ddt, enum ddt_type type, enum ddt_class class,
char *name)
{
- (void) sprintf(name, DMU_POOL_DDT,
+ (void) snprintf(name, DDT_NAMELEN, DMU_POOL_DDT,
zio_checksum_table[ddt->ddt_checksum].ci_name,
ddt_ops[type]->ddt_op_name, ddt_class_name[class]);
}
diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
index 5b8069bd6..16b93a4fe 100644
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@ -1870,14 +1870,15 @@ do_userquota_update(objset_t *os, userquota_cache_t *cache, uint64_t used,
if (subtract)
delta = -delta;
- (void) sprintf(name, "%llx", (longlong_t)user);
+ (void) snprintf(name, sizeof (name), "%llx", (longlong_t)user);
userquota_update_cache(&cache->uqc_user_deltas, name, delta);
- (void) sprintf(name, "%llx", (longlong_t)group);
+ (void) snprintf(name, sizeof (name), "%llx", (longlong_t)group);
userquota_update_cache(&cache->uqc_group_deltas, name, delta);
if (dmu_objset_projectquota_enabled(os)) {
- (void) sprintf(name, "%llx", (longlong_t)project);
+ (void) snprintf(name, sizeof (name), "%llx",
+ (longlong_t)project);
userquota_update_cache(&cache->uqc_project_deltas,
name, delta);
}
@@ -2438,7 +2439,7 @@ dmu_snapshot_list_next(objset_t *os, int namelen, char *name,
return (SET_ERROR(ENAMETOOLONG));
}
- (void) strcpy(name, attr.za_name);
+ (void) strlcpy(name, attr.za_name, namelen);
if (idp)
*idp = attr.za_first_integer;
if (case_conflict)
@@ -2483,7 +2484,7 @@ dmu_dir_list_next(objset_t *os, int namelen, char *name,
return (SET_ERROR(ENAMETOOLONG));
}
- (void) strcpy(name, attr.za_name);
+ (void) strlcpy(name, attr.za_name, namelen);
if (idp)
*idp = attr.za_first_integer;
zap_cursor_advance(&cursor);
diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
index 0117a17ce..403e85592 100644
--- a/module/zfs/dmu_send.c
+++ b/module/zfs/dmu_send.c
@@ -2008,7 +2008,8 @@ create_begin_record(struct dmu_send_params *dspp, objset_t *os,
if (dspp->savedok) {
drrb->drr_toguid = dspp->saved_guid;
- strcpy(drrb->drr_toname, dspp->saved_toname);
+ strlcpy(drrb->drr_toname, dspp->saved_toname,
+ sizeof (drrb->drr_toname));
} else {
dsl_dataset_name(to_ds, drrb->drr_toname);
if (!to_ds->ds_is_snapshot) {
diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c
index 2d6e95e31..4986bc449 100644
--- a/module/zfs/dsl_dataset.c
+++ b/module/zfs/dsl_dataset.c
@@ -906,7 +906,7 @@ void
dsl_dataset_name(dsl_dataset_t *ds, char *name)
{
if (ds == NULL) {
- (void) strcpy(name, "mos");
+ (void) strlcpy(name, "mos", ZFS_MAX_DATASET_NAME_LEN);
} else {
dsl_dir_name(ds->ds_dir, name);
VERIFY0(dsl_dataset_get_snapname(ds));
@@ -2427,9 +2427,12 @@ get_receive_resume_stats_impl(dsl_dataset_t *ds)
zio_cksum_t cksum;
fletcher_4_native_varsize(compressed, compressed_size, &cksum);
- str = kmem_alloc(compressed_size * 2 + 1, KM_SLEEP);
+ size_t alloc_size = compressed_size * 2 + 1;
+ str = kmem_alloc(alloc_size, KM_SLEEP);
for (int i = 0; i < compressed_size; i++) {
- (void) sprintf(str + i * 2, "%02x", compressed[i]);
+ size_t offset = i * 2;
+ (void) snprintf(str + offset, alloc_size - offset,
+ "%02x", compressed[i]);
}
str[compressed_size * 2] = '\0';
char *propval = kmem_asprintf("%u-%llx-%llx-%s",
@@ -2437,7 +2440,7 @@ get_receive_resume_stats_impl(dsl_dataset_t *ds)
(longlong_t)cksum.zc_word[0],
(longlong_t)packed_size, str);
kmem_free(packed, packed_size);
- kmem_free(str, compressed_size * 2 + 1);
+ kmem_free(str, alloc_size);
kmem_free(compressed, packed_size);
return (propval);
}
@@ -3911,7 +3914,8 @@ dsl_dataset_promote(const char *name, char *conflsnap)
*/
snap_pair = nvlist_next_nvpair(ddpa.err_ds, NULL);
if (snap_pair != NULL && conflsnap != NULL)
- (void) strcpy(conflsnap, nvpair_name(snap_pair));
+ (void) strlcpy(conflsnap, nvpair_name(snap_pair),
+ ZFS_MAX_DATASET_NAME_LEN);
fnvlist_free(ddpa.err_ds);
return (error);
diff --git a/module/zfs/dsl_dir.c b/module/zfs/dsl_dir.c
index 63ecb1d39..d33d5ed93 100644
--- a/module/zfs/dsl_dir.c
+++ b/module/zfs/dsl_dir.c
@@ -245,7 +245,8 @@ dsl_dir_hold_obj(dsl_pool_t *dp, uint64_t ddobj,
if (err != 0)
goto errout;
} else {
- (void) strcpy(dd->dd_myname, spa_name(dp->dp_spa));
+ (void) strlcpy(dd->dd_myname, spa_name(dp->dp_spa),
+ sizeof (dd->dd_myname));
}
if (dsl_dir_is_clone(dd)) {
@@ -423,7 +424,7 @@ getcomponent(const char *path, char *component, const char **nextp)
return (SET_ERROR(EINVAL));
if (strlen(path) >= ZFS_MAX_DATASET_NAME_LEN)
return (SET_ERROR(ENAMETOOLONG));
- (void) strcpy(component, path);
+ (void) strlcpy(component, path, ZFS_MAX_DATASET_NAME_LEN);
p = NULL;
} else if (p[0] == '/') {
if (p - path >= ZFS_MAX_DATASET_NAME_LEN)
diff --git a/module/zfs/dsl_prop.c b/module/zfs/dsl_prop.c
index 0b4bf23ee..f6ff9ae47 100644
--- a/module/zfs/dsl_prop.c
+++ b/module/zfs/dsl_prop.c
@@ -132,8 +132,9 @@ dsl_prop_get_dd(dsl_dir_t *dd, const char *propname,
if (inheriting) {
dsl_dir_name(dd, setpoint);
} else {
- (void) strcpy(setpoint,
- ZPROP_SOURCE_VAL_RECVD);
+ (void) strlcpy(setpoint,
+ ZPROP_SOURCE_VAL_RECVD,
+ MAXNAMELEN);
}
}
break;
@@ -206,8 +207,9 @@ dsl_prop_get_ds(dsl_dataset_t *ds, const char *propname,
kmem_strfree(recvdstr);
if (err != ENOENT) {
if (setpoint != NULL && err == 0)
- (void) strcpy(setpoint,
- ZPROP_SOURCE_VAL_RECVD);
+ (void) strlcpy(setpoint,
+ ZPROP_SOURCE_VAL_RECVD,
+ MAXNAMELEN);
return (err);
}
}
diff --git a/module/zfs/dsl_scan.c b/module/zfs/dsl_scan.c
index f09501793..efdf5b24f 100644
--- a/module/zfs/dsl_scan.c
+++ b/module/zfs/dsl_scan.c
@@ -360,7 +360,7 @@ scan_init(void)
for (int i = 0; i < SPA_DVAS_PER_BP; i++) {
char name[36];
- (void) sprintf(name, "sio_cache_%d", i);
+ (void) snprintf(name, sizeof (name), "sio_cache_%d", i);
sio_cache[i] = kmem_cache_create(name,
(sizeof (scan_io_t) + ((i + 1) * sizeof (dva_t))),
0, NULL, NULL, NULL, NULL, NULL, 0);
diff --git a/module/zfs/dsl_userhold.c b/module/zfs/dsl_userhold.c
index 181fc3946..75d153194 100644
--- a/module/zfs/dsl_userhold.c
+++ b/module/zfs/dsl_userhold.c
@@ -101,9 +101,9 @@ dsl_dataset_user_hold_check(void *arg, dmu_tx_t *tx)
size_t len = strlen(nvpair_name(pair)) +
strlen(fnvpair_value_string(pair));
char *nameval = kmem_zalloc(len + 2, KM_SLEEP);
- (void) strcpy(nameval, nvpair_name(pair));
- (void) strcat(nameval, "@");
- (void) strcat(nameval, fnvpair_value_string(pair));
+ (void) strlcpy(nameval, nvpair_name(pair), len + 2);
+ (void) strlcat(nameval, "@", len + 2);
+ (void) strlcat(nameval, fnvpair_value_string(pair), len + 2);
fnvlist_add_string(tmp_holds, nameval, "");
kmem_free(nameval, len + 2);
}
diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 73d63f849..87af3073a 100644
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -6647,8 +6647,8 @@ spa_vdev_attach(spa_t *spa, uint64_t guid, nvlist_t *nvroot, int replacing)
spa_strfree(oldvd->vdev_path);
oldvd->vdev_path = kmem_alloc(strlen(newvd->vdev_path) + 5,
KM_SLEEP);
- (void) sprintf(oldvd->vdev_path, "%s/%s",
- newvd->vdev_path, "old");
+ (void) snprintf(oldvd->vdev_path, strlen(newvd->vdev_path) + 5,
+ "%s/%s", newvd->vdev_path, "old");
if (oldvd->vdev_devid != NULL) {
spa_strfree(oldvd->vdev_devid);
oldvd->vdev_devid = NULL;
diff --git a/module/zfs/zap.c b/module/zfs/zap.c
index 01c06aa3f..1abb32fdf 100644
--- a/module/zfs/zap.c
+++ b/module/zfs/zap.c
@@ -1030,7 +1030,7 @@ zap_value_search(objset_t *os, uint64_t zapobj, uint64_t value, uint64_t mask,
(err = zap_cursor_retrieve(&zc, za)) == 0;
zap_cursor_advance(&zc)) {
if ((za->za_first_integer & mask) == (value & mask)) {
- (void) strcpy(name, za->za_name);
+ (void) strlcpy(name, za->za_name, MAXNAMELEN);
break;
}
}
diff --git a/module/zfs/zap_micro.c b/module/zfs/zap_micro.c
index c3d42d0ee..33e951afc 100644
--- a/module/zfs/zap_micro.c
+++ b/module/zfs/zap_micro.c
@@ -1602,7 +1602,8 @@ zap_cursor_retrieve(zap_cursor_t *zc, zap_attribute_t *za)
za->za_integer_length = 8;
za->za_num_integers = 1;
za->za_first_integer = mzep->mze_value;
- (void) strcpy(za->za_name, mzep->mze_name);
+ (void) strlcpy(za->za_name, mzep->mze_name,
+ sizeof (za->za_name));
zc->zc_hash = mze->mze_hash;
zc->zc_cd = mze->mze_cd;
err = 0;
diff --git a/module/zfs/zcp_get.c b/module/zfs/zcp_get.c
index 311875583..a23230ffb 100644
--- a/module/zfs/zcp_get.c
+++ b/module/zfs/zcp_get.c
@@ -82,13 +82,13 @@ get_objset_type_name(dsl_dataset_t *ds, char *str)
return (error);
switch (type) {
case ZFS_TYPE_SNAPSHOT:
- (void) strcpy(str, "snapshot");
+ (void) strlcpy(str, "snapshot", ZAP_MAXVALUELEN);
break;
case ZFS_TYPE_FILESYSTEM:
- (void) strcpy(str, "filesystem");
+ (void) strlcpy(str, "filesystem", ZAP_MAXVALUELEN);
break;
case ZFS_TYPE_VOLUME:
- (void) strcpy(str, "volume");
+ (void) strlcpy(str, "volume", ZAP_MAXVALUELEN);
break;
default:
return (EINVAL);
@@ -321,11 +321,11 @@ get_special_prop(lua_State *state, dsl_dataset_t *ds, const char *dsname,
break;
case ZFS_PROP_FILESYSTEM_COUNT:
error = dsl_dir_get_filesystem_count(ds->ds_dir, &numval);
- (void) strcpy(setpoint, "");
+ (void) strlcpy(setpoint, "", ZFS_MAX_DATASET_NAME_LEN);
break;
case ZFS_PROP_SNAPSHOT_COUNT:
error = dsl_dir_get_snapshot_count(ds->ds_dir, &numval);
- (void) strcpy(setpoint, "");
+ (void) strlcpy(setpoint, "", ZFS_MAX_DATASET_NAME_LEN);
break;
case ZFS_PROP_NUMCLONES:
numval = dsl_get_numclones(ds);
@@ -367,7 +367,8 @@ get_special_prop(lua_State *state, dsl_dataset_t *ds, const char *dsname,
sizeof (numval), 1, &numval);
}
if (error == 0)
- (void) strcpy(setpoint, dsname);
+ (void) strlcpy(setpoint, dsname,
+ ZFS_MAX_DATASET_NAME_LEN);
break;
case ZFS_PROP_VOLBLOCKSIZE: {
@@ -693,9 +694,10 @@ parse_written_prop(const char *dataset_name, const char *prop_name,
ASSERT(zfs_prop_written(prop_name));
const char *name = prop_name + ZFS_WRITTEN_PROP_PREFIX_LEN;
if (strchr(name, '@') == NULL) {
- (void) sprintf(snap_name, "%s@%s", dataset_name, name);
+ (void) snprintf(snap_name, ZFS_MAX_DATASET_NAME_LEN, "%s@%s",
+ dataset_name, name);
} else {
- (void) strcpy(snap_name, name);
+ (void) strlcpy(snap_name, name, ZFS_MAX_DATASET_NAME_LEN);
}
}
diff --git a/module/zfs/zfs_fuid.c b/module/zfs/zfs_fuid.c
index dbf9d31a9..fbd06be4f 100644
--- a/module/zfs/zfs_fuid.c
+++ b/module/zfs/zfs_fuid.c
@@ -778,7 +778,7 @@ zfs_fuid_txhold(zfsvfs_t *zfsvfs, dmu_tx_t *tx)
*/
int
zfs_id_to_fuidstr(zfsvfs_t *zfsvfs, const char *domain, uid_t rid,
- char *buf, boolean_t addok)
+ char *buf, size_t len, boolean_t addok)
{
uint64_t fuid;
int domainid = 0;
@@ -789,7 +789,7 @@ zfs_id_to_fuidstr(zfsvfs_t *zfsvfs, const char *domain, uid_t rid,
return (SET_ERROR(ENOENT));
}
fuid = FUID_ENCODE(domainid, rid);
- (void) sprintf(buf, "%llx", (longlong_t)fuid);
+ (void) snprintf(buf, len, "%llx", (longlong_t)fuid);
return (0);
}
#endif
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index d55ce20ef..6e7e9b9f0 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -2504,7 +2504,8 @@ zfs_prop_set_special(const char *dsname, zprop_source_t source,
zfs_cmd_t *zc;
zc = kmem_zalloc(sizeof (zfs_cmd_t), KM_SLEEP);
- (void) strcpy(zc->zc_name, dsname);
+ (void) strlcpy(zc->zc_name, dsname,
+ sizeof (zc->zc_name));
(void) zfs_ioc_userspace_upgrade(zc);
(void) zfs_ioc_id_quota_upgrade(zc);
kmem_free(zc, sizeof (zfs_cmd_t));
@@ -5271,7 +5272,7 @@ zfs_ioc_recv_new(const char *fsname, nvlist_t *innvl, nvlist_t *outnvl)
strchr(snapname, '%'))
return (SET_ERROR(EINVAL));
- (void) strcpy(tofs, snapname);
+ (void) strlcpy(tofs, snapname, sizeof (tofs));
tosnap = strchr(tofs, '@');
*tosnap++ = '\0';
diff --git a/module/zfs/zfs_quota.c b/module/zfs/zfs_quota.c
index 1acfbf1ea..6c83f79c9 100644
--- a/module/zfs/zfs_quota.c
+++ b/module/zfs/zfs_quota.c
@@ -269,7 +269,8 @@ zfs_userspace_one(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type,
offset = DMU_OBJACCT_PREFIX_LEN;
}
- err = zfs_id_to_fuidstr(zfsvfs, domain, rid, buf + offset, B_FALSE);
+ err = zfs_id_to_fuidstr(zfsvfs, domain, rid, buf + offset,
+ sizeof (buf) - offset, B_FALSE);
if (err)
return (err);
@@ -325,7 +326,7 @@ zfs_set_userquota(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type,
return (SET_ERROR(EINVAL));
}
- err = zfs_id_to_fuidstr(zfsvfs, domain, rid, buf, B_TRUE);
+ err = zfs_id_to_fuidstr(zfsvfs, domain, rid, buf, sizeof (buf), B_TRUE);
if (err)
return (err);
fuid_dirtied = zfsvfs->z_fuid_dirty;
@@ -407,12 +408,13 @@ zfs_id_overobjquota(zfsvfs_t *zfsvfs, uint64_t usedobj, uint64_t id)
if (quotaobj == 0 || zfsvfs->z_replay)
return (B_FALSE);
- (void) sprintf(buf, "%llx", (longlong_t)id);
+ (void) snprintf(buf, sizeof (buf), "%llx", (longlong_t)id);
err = zap_lookup(zfsvfs->z_os, quotaobj, buf, 8, 1, &quota);
if (err != 0)
return (B_FALSE);
- (void) sprintf(buf, DMU_OBJACCT_PREFIX "%llx", (longlong_t)id);
+ (void) snprintf(buf, sizeof (buf), DMU_OBJACCT_PREFIX "%llx",
+ (longlong_t)id);
err = zap_lookup(zfsvfs->z_os, usedobj, buf, 8, 1, &used);
if (err != 0)
return (B_FALSE);
@@ -448,7 +450,7 @@ zfs_id_overblockquota(zfsvfs_t *zfsvfs, uint64_t usedobj, uint64_t id)
if (quotaobj == 0 || zfsvfs->z_replay)
return (B_FALSE);
- (void) sprintf(buf, "%llx", (longlong_t)id);
+ (void) snprintf(buf, sizeof (buf), "%llx", (longlong_t)id);
err = zap_lookup(zfsvfs->z_os, quotaobj, buf, 8, 1, &quota);
if (err != 0)
return (B_FALSE);
diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index b9a3ddcf2..0de502cee 100644
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -203,11 +203,13 @@ zio_init(void)
if (align != 0) {
char name[36];
- (void) sprintf(name, "zio_buf_%lu", (ulong_t)size);
+ (void) snprintf(name, sizeof (name), "zio_buf_%lu",
+ (ulong_t)size);
zio_buf_cache[c] = kmem_cache_create(name, size,
align, NULL, NULL, NULL, NULL, NULL, cflags);
- (void) sprintf(name, "zio_data_buf_%lu", (ulong_t)size);
+ (void) snprintf(name, sizeof (name), "zio_data_buf_%lu",
+ (ulong_t)size);
zio_data_buf_cache[c] = kmem_cache_create(name, size,
align, NULL, NULL, NULL, NULL,
data_alloc_arena, data_cflags);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-17 11:10:17 +0000