From nobody Mon May 23 22:11:37 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9642E1B34D21; Mon, 23 May 2022 22:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L6Wky0xnSz4pLJ; Mon, 23 May 2022 22:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653343898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Re6KoC15yo1EkFjliDFr2RqGmtN41wb3nf7TbYryyjo=; b=ySC/TZMc9YciPuP5wJwTZP1HA+Xesyz8Y1oJ6ylnLBI/dQ4aA4Rzm9PVCBCgasMJRrif/C vrGbXr7qO+Qh7Y19HiRn9kQIZANaTM1imqoyFAZzmoVsVJYKumvkZnfKwhHx23JlMTFvXn mrRcukmbPBy5bYgIp5BhcGqNrfWLnSMk1nfZbK8NxMAyvg2KOMhffjp4/qvIyVAM2HSsvC m4Th3UGbI6fyx4iQ/Vsa/rcHj/eg6DdfRYwNPY0xh0+1aSdAoEkZQj/rUtl1iX0WdL3o/7 TCHfoYEMnT3xGyGV+uFIRGp3h2qgq5/O7tMgPrClKeh4KJYKmvy7lLw2EbvFIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E17FA17D6E; Mon, 23 May 2022 22:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24NMBbGF094609; Mon, 23 May 2022 22:11:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NMBb4R094608; Mon, 23 May 2022 22:11:37 GMT (envelope-from git) Date: Mon, 23 May 2022 22:11:37 GMT Message-Id: <202205232211.24NMBb4R094608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: 4628957c9ca4 - stable/12 - cpuset: Fix the KASAN and KMSAN builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4628957c9ca45e1a39d5d9593f232e561f18230a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653343898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Re6KoC15yo1EkFjliDFr2RqGmtN41wb3nf7TbYryyjo=; b=QArFvrn1QIiYUln0HZeGyBk7H6JFgFplR9YLq7aKvmKAtjwiUKR+dDC/ZnmYRm03KdEnKz TMLjdps9FTdkKRru4TpcWIw84N7sh4+cziPam1oCvS2bYY5gFaJYsAc/tRxdeN0BcnkdrQ p3nxO9nX/BPfp/3K2WRRxcwSgNcpJd4YO80ZAEcRkCp8A3PI6kgqcqruMmMHDXaUnbdcby Zqexe9mE09SpdhA2aMYJe4zh6/pTx2IhGfDJ5YO351/Qwf8+kSEQ8ycpLDKnEhE1McxPsp SvY3tvg/fTQHeVojM9HUREJ7RPk312pRIr43MOF3jlAhm2VnfB+A4VqvHmUi+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653343898; a=rsa-sha256; cv=none; b=CdcA06D9jRvYHjsWSSjerWQAXtny0qGVDQN3JPASOeTlOjC7I7ETgwUyqWq5kXFwaMKcg1 +eL2/Z4IPVJJxi9or7VoUAn8uYFPv4YR43v9/mR/ttT0ddcj2JJ5Twa5iCikKBgCIjXgGD FpNQ3z0zr01ti+ECYaTTmN9vz+WlruSh86xiFOu0VCSW50AayD7+tKlsiCUWWe2RQ8XU/e XmFWL5SV/Ymefg8F6sFnYL+fVvaT2LApvzRW+PVrAgfYA2HwHwGPQ2qBV/1S43EBrHAm7Q fsBDSMYyv0Esaxe7+/ERn+bhQ6dWu0j+qK1MoDI+tTZWW7dZtR18Ft6My7hMow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=4628957c9ca45e1a39d5d9593f232e561f18230a commit 4628957c9ca45e1a39d5d9593f232e561f18230a Author: Mark Johnston AuthorDate: 2022-05-20 14:11:31 +0000 Commit: Justin Hibbits CommitDate: 2022-05-23 19:16:09 +0000 cpuset: Fix the KASAN and KMSAN builds Rename the "copyin" and "copyout" fields of struct cpuset_copy_cb to something less generic, since sanitizers define interceptors for copyin() and copyout() using #define. Reported by: syzbot+2db5d644097fc698fb6f@syzkaller.appspotmail.com Fixes: 47a57144af25 ("cpuset: Byte swap cpuset for compat32 on big endian architectures") Sponsored by: The FreeBSD Foundation (cherry picked from commit 4a3e51335e86cee02569c04b9f1e95ca9abcb170) --- sys/compat/freebsd32/freebsd32_misc.c | 4 ++-- sys/compat/linux/linux_misc.c | 4 ++-- sys/kern/kern_cpuset.c | 10 +++++----- sys/sys/cpuset.h | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 438004f4a088..9294150db9f7 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -3062,8 +3062,8 @@ copyout32_set(const void *k, void *u, size_t size) } static const struct cpuset_copy_cb cpuset_copy32_cb = { - .copyin = copyin32_set, - .copyout = copyout32_set + .cpuset_copyin = copyin32_set, + .cpuset_copyout = copyout32_set }; int diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 547f3fe7a22c..22e2df08a947 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2024,8 +2024,8 @@ linux_sched_getparam(struct thread *td, } static const struct cpuset_copy_cb copy_set = { - .copyin = copyin, - .copyout = copyout + .cpuset_copyin = copyin, + .cpuset_copyout = copyout }; /* diff --git a/sys/kern/kern_cpuset.c b/sys/kern/kern_cpuset.c index f8176256aee2..ca20b2d43b3c 100644 --- a/sys/kern/kern_cpuset.c +++ b/sys/kern/kern_cpuset.c @@ -1648,8 +1648,8 @@ cpuset_check_capabilities(struct thread *td, cpulevel_t level, cpuwhich_t which, } static const struct cpuset_copy_cb copy_set = { - .copyin = copyin, - .copyout = copyout + .cpuset_copyin = copyin, + .cpuset_copyout = copyout }; #ifndef _SYS_SYSPROTO_H_ @@ -1885,7 +1885,7 @@ kern_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, if (p) PROC_UNLOCK(p); if (error == 0) - error = cb->copyout(mask, maskp, size); + error = cb->cpuset_copyout(mask, maskp, size); out: free(mask, M_TEMP); return (error); @@ -2136,7 +2136,7 @@ kern_cpuset_getdomain(struct thread *td, cpulevel_t level, cpuwhich_t which, } DOMAINSET_COPY(&outset.ds_mask, mask); if (error == 0) - error = cb->copyout(mask, maskp, domainsetsize); + error = cb->cpuset_copyout(mask, maskp, domainsetsize); if (error == 0) if (suword32(policyp, outset.ds_policy) != 0) error = EFAULT; @@ -2187,7 +2187,7 @@ kern_cpuset_setdomain(struct thread *td, cpulevel_t level, cpuwhich_t which, return (error); memset(&domain, 0, sizeof(domain)); mask = malloc(domainsetsize, M_TEMP, M_WAITOK | M_ZERO); - error = cb->copyin(maskp, mask, domainsetsize); + error = cb->cpuset_copyin(maskp, mask, domainsetsize); if (error) goto out; /* diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h index 697e220a70df..7a3a6753acc2 100644 --- a/sys/sys/cpuset.h +++ b/sys/sys/cpuset.h @@ -136,8 +136,8 @@ struct thread; * ABIs, like compat32. */ struct cpuset_copy_cb { - int (*copyin)(const void *, void *, size_t); - int (*copyout)(const void *, void *, size_t); + int (*cpuset_copyin)(const void *, void *, size_t); + int (*cpuset_copyout)(const void *, void *, size_t); }; struct cpuset *cpuset_thread0(void);