Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions src/unix/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -2220,7 +2220,7 @@ sysreturn sched_setaffinity(int pid, u64 cpusetsize, u64 *mask)
context ctx = get_current_context(current_cpu());
u64 first_cpu = -1ull;
u64 i;
if (context_set_err(ctx))
if (!validate_user_memory(mask, cpusetsize, false) || context_set_err(ctx))
return -EFAULT;
for (i = 0; (first_cpu == -1ull) && (i + sizeof(u64) <= cpusetsize); i += sizeof(u64))
first_cpu = i * 8 + lsb(mask[i / sizeof(u64)]);
Expand All @@ -2236,10 +2236,12 @@ sysreturn sched_setaffinity(int pid, u64 cpusetsize, u64 *mask)
bitmap affinity = t->task.affinity;
sysreturn rv;
thread_lock(t);
if (!copy_from_user(mask, bitmap_base(affinity), cpusetsize)) {
if (context_set_err(ctx)) {
rv = -EFAULT;
goto out;
}
runtime_memcpy(bitmap_base(affinity), mask, cpusetsize);
context_clear_err(ctx);
u64 cpus = cpusetsize * 8;
if (cpus < total_processors)
bitmap_range_check_and_set(affinity, cpus, total_processors - cpus, false, false);
Expand Down