Commit 0ffb645e authored by Justin Stitt's avatar Justin Stitt Committed by Mike Snitzer

dm ioctl: replace deprecated strncpy with strscpy_pad

`strncpy` is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces.

We expect `spec->target_type` to be NUL-terminated based on its use with
a format string after `dm_table_add_target()` is called
| 	r = dm_table_add_target(table, spec->target_type,
| 				(sector_t) spec->sector_start,
| 				(sector_t) spec->length,
| 				target_params);
... wherein `spec->target_type` is passed as parameter `type` and later
printed with DMERR:
|       DMERR("%s: %s: unknown target type", dm_device_name(t->md), type);

It appears that `spec` is not zero-allocated and thus NUL-padding may be
required in this ioctl context.

Considering the above, a suitable replacement is `strscpy_pad` due to
the fact that it guarantees NUL-termination whilst maintaining the
NUL-padding behavior that strncpy provides.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1]
Link: https://github.com/KSPP/linux/issues/90Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJustin Stitt <justinstitt@google.com>
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
parent e9d7bd2c
...@@ -1295,8 +1295,8 @@ static void retrieve_status(struct dm_table *table, ...@@ -1295,8 +1295,8 @@ static void retrieve_status(struct dm_table *table,
spec->status = 0; spec->status = 0;
spec->sector_start = ti->begin; spec->sector_start = ti->begin;
spec->length = ti->len; spec->length = ti->len;
strncpy(spec->target_type, ti->type->name, strscpy_pad(spec->target_type, ti->type->name,
sizeof(spec->target_type) - 1); sizeof(spec->target_type));
outptr += sizeof(struct dm_target_spec); outptr += sizeof(struct dm_target_spec);
remaining = len - (outptr - outbuf); remaining = len - (outptr - outbuf);
......
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