Commit 6bec620
wasi: fix serdes bugs from snapshot1 migration
During the migration to WASI snapshot1, a field was removed
from the subscription type. The field was removed from the
code, but the bounds checking logic was not updated. This
commit updates that check.
Similarly, __wasi_linkcount_t changed from a uint32_t to a
uint64_t. However, the bounds checks were missed, and the code
was still writing uint32_t's (to the new correct offset) instead
of uint64_t's. This commit updates that logic as well.
Refs: #30980
PR-URL: #31122
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent 59101b5 commit 6bec620
1 file changed
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -544,15 +544,15 @@ void WASI::FdFilestatGet(const FunctionCallbackInfo<Value>& args) { | |||
| 544 | 544 | ASSIGN_OR_RETURN_UNWRAP(&wasi, args.This()); | |
| 545 | 545 | Debug(wasi, "fd_filestat_get(%d, %d)\n", fd, buf); | |
| 546 | 546 | GET_BACKING_STORE_OR_RETURN(wasi, args, &memory, &mem_size); | |
| 547 | - CHECK_BOUNDS_OR_RETURN(args, mem_size, buf, 56); | ||
| 547 | + CHECK_BOUNDS_OR_RETURN(args, mem_size, buf, 64); | ||
| 548 | 548 | uvwasi_filestat_t stats; | |
| 549 | 549 | uvwasi_errno_t err = uvwasi_fd_filestat_get(&wasi->uvw_, fd, &stats); | |
| 550 | 550 | ||
| 551 | 551 | if (err == UVWASI_ESUCCESS) { | |
| 552 | 552 | wasi->writeUInt64(memory, stats.st_dev, buf); | |
| 553 | 553 | wasi->writeUInt64(memory, stats.st_ino, buf + 8); | |
| 554 | 554 | wasi->writeUInt8(memory, stats.st_filetype, buf + 16); | |
| 555 | - wasi->writeUInt32(memory, stats.st_nlink, buf + 24); | ||
| 555 | + wasi->writeUInt64(memory, stats.st_nlink, buf + 24); | ||
| 556 | 556 | wasi->writeUInt64(memory, stats.st_size, buf + 32); | |
| 557 | 557 | wasi->writeUInt64(memory, stats.st_atim, buf + 40); | |
| 558 | 558 | wasi->writeUInt64(memory, stats.st_mtim, buf + 48); | |
@@ -1068,7 +1068,7 @@ void WASI::PathFilestatGet(const FunctionCallbackInfo<Value>& args) { | |||
| 1068 | 1068 | path_len); | |
| 1069 | 1069 | GET_BACKING_STORE_OR_RETURN(wasi, args, &memory, &mem_size); | |
| 1070 | 1070 | CHECK_BOUNDS_OR_RETURN(args, mem_size, path_ptr, path_len); | |
| 1071 | - CHECK_BOUNDS_OR_RETURN(args, mem_size, buf_ptr, 56); | ||
| 1071 | + CHECK_BOUNDS_OR_RETURN(args, mem_size, buf_ptr, 64); | ||
| 1072 | 1072 | uvwasi_filestat_t stats; | |
| 1073 | 1073 | uvwasi_errno_t err = uvwasi_path_filestat_get(&wasi->uvw_, | |
| 1074 | 1074 | fd, | |
@@ -1080,7 +1080,7 @@ void WASI::PathFilestatGet(const FunctionCallbackInfo<Value>& args) { | |||
| 1080 | 1080 | wasi->writeUInt64(memory, stats.st_dev, buf_ptr); | |
| 1081 | 1081 | wasi->writeUInt64(memory, stats.st_ino, buf_ptr + 8); | |
| 1082 | 1082 | wasi->writeUInt8(memory, stats.st_filetype, buf_ptr + 16); | |
| 1083 | - wasi->writeUInt32(memory, stats.st_nlink, buf_ptr + 24); | ||
| 1083 | + wasi->writeUInt64(memory, stats.st_nlink, buf_ptr + 24); | ||
| 1084 | 1084 | wasi->writeUInt64(memory, stats.st_size, buf_ptr + 32); | |
| 1085 | 1085 | wasi->writeUInt64(memory, stats.st_atim, buf_ptr + 40); | |
| 1086 | 1086 | wasi->writeUInt64(memory, stats.st_mtim, buf_ptr + 48); | |
@@ -1422,7 +1422,7 @@ void WASI::PollOneoff(const FunctionCallbackInfo<Value>& args) { | |||
| 1422 | 1422 | nsubscriptions, | |
| 1423 | 1423 | nevents_ptr); | |
| 1424 | 1424 | GET_BACKING_STORE_OR_RETURN(wasi, args, &memory, &mem_size); | |
| 1425 | - CHECK_BOUNDS_OR_RETURN(args, mem_size, in_ptr, nsubscriptions * 56); | ||
| 1425 | + CHECK_BOUNDS_OR_RETURN(args, mem_size, in_ptr, nsubscriptions * 48); | ||
| 1426 | 1426 | CHECK_BOUNDS_OR_RETURN(args, mem_size, out_ptr, nsubscriptions * 32); | |
| 1427 | 1427 | CHECK_BOUNDS_OR_RETURN(args, mem_size, nevents_ptr, 4); | |
| 1428 | 1428 | uvwasi_subscription_t* in = | |
0 commit comments