Skip to content

nvpair: i_get_value_size() string array handling tweak #18877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
behlendorf merged 1 commit into from
Aug 7, 2026
+15 −0
Merged

nvpair: i_get_value_size() string array handling tweak #18877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions module/nvpair/nvpair.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,6 +1111,21 @@ i_get_value_size(data_type_t type, const void *data, uint_t nelem,
uint_t i;
size_t newsize;

/*
* Packed STRING_ARRAY values start with a pointer table
* (nelem * sizeof (uint64_t)), with the strings
* following. We need to skip the pointer table for
* the strnlen() bounds check to function as intended.
* We distinguish packed STRING_ARRAY values from
* arbitrary ones using the value of max_size.
*/
if (max_size != (size_t)INT32_MAX) {
/* packed value region */
if (max_size < value_sz)
return (-1);
max_size -= (size_t)value_sz;
}

/* no alignment requirement for strings */
for (i = 0; i < nelem; i++) {
if (strs[i] == NULL)
Expand Down
Loading