summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2020-12-04 02:19:45 +0000
committerKyle Evans <kevans@FreeBSD.org>2020-12-04 02:19:45 +0000
commitf3d17722033b39b668e10370ccbb7d7b436a96a2 (patch)
tree76e20c958d8fdf9c38a90eeb1dc17b61a2b48e0b /sys
parent99fafc4b1b7971cd5b6fd16faac894778685b1ab (diff)
downloadsrc-test2-f3d17722033b39b668e10370ccbb7d7b436a96a2.tar.gz
src-test2-f3d17722033b39b668e10370ccbb7d7b436a96a2.zip
MFC r367944: cpuset_setproc: use the appropriate parent for new anon. sets
As far as I can tell, this has been the case since initially committed in 2008. cpuset_setproc is the executor of cpuset reassignment; note this excerpt from the description: * 1) Set is non-null. This reparents all anonymous sets to the provided * set and replaces all non-anonymous td_cpusets with the provided set. However, reviewing cpuset_setproc_setthread() for some jail related work unearthed the error: if tdset was not anonymous, we were replacing it with `set`. If it was anonymous, then we'd rebase it onto `set` (i.e. copy the thread's mask over and AND it with `set`) but give the new anonymous set the original tdset as the parent (i.e. the base of the set we're supposed to be leaving behind). The primary visible consequences were that: 1.) cpuset_getid() following such assignment returns the wrong result, the setid that we left behind rather than the one we joined. 2.) When a process attached to the jail, the base set of any anonymous threads was a set outside of the jail. This was initially bundled in D27298, but it's a minor fix that's fairly easy to verify the correctness of. A test is included in D27307 ("badparent"), which demonstrates the issue with, effectively: osetid = cpuset_getid() newsetid = cpuset() cpuset_setaffinity(thread) cpuset_setid(osetid) cpuset_getid(thread) -> observe that it matches newsetid instead of osetid.
Notes
Notes: svn path=/stable/12/; revision=368322
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/kern_cpuset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_cpuset.c b/sys/kern/kern_cpuset.c
index a730dee5e7a4..e16a7ec01ba1 100644
--- a/sys/kern/kern_cpuset.c
+++ b/sys/kern/kern_cpuset.c
@@ -1095,7 +1095,7 @@ cpuset_setproc_setthread(struct cpuset *tdset, struct cpuset *set,
if (error)
return (error);
- return cpuset_shadow(tdset, nsetp, &mask, &domain, freelist,
+ return cpuset_shadow(set, nsetp, &mask, &domain, freelist,
domainlist);
}