From nobody Thu Feb 9 15:17:12 2023 X-Original-To: dev-commits-src-main@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 4PCL7s3pNlz3pf95; Thu, 9 Feb 2023 15:17:13 +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 4PCL7s2ndGz43ct; Thu, 9 Feb 2023 15:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675955833; 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=oKs40PqIIVzLofkwuDtDiqxMUZcA3ELGPY6m308lq9A=; b=pXKoYIQS0gjMZQHJFgg5mpCauPtUGoOAtqA1b/3Vvx/t/WVVZXQkCRtLBPsxozXr3mkclA GmC1tZdVYZB9hQBs+Y78j5owK7ihSip0NDC/R7+vnsexKR07Gp9HMIahSE0lRo8c4VE5u6 qI2iuFM6+Zkue8FM3NQzQiIIFOm+MLB5fQLHzCzYFx2JEkow15IaUK9Y8H+ED6UBGCPgk7 2+qu+D9Ub2WDUc9iQqXAFGADBwIAu+6Z0jzeiTPaD51nuD3aNEQBO/sGz3Hy/RiS/4SgAb Zj0pLawOM6W6R3UnQF8qeghnlkQVz+XM2no+Ne80Q7giAwW5IM0qi9N4o9l+uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675955833; 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=oKs40PqIIVzLofkwuDtDiqxMUZcA3ELGPY6m308lq9A=; b=HLf2SKFLHN73XDKOz2MiQMvYL1/i7X5Beiw8qrQkFPrs1W3JBvDhiSlHgrvb2oc1uipTxc FevoNSckgNErSe1erfWk1F++8Y+HaKAZN899gZUre0MKzoYfKiEvK6Vg2IGGCejuUH+abZ CNUd3mFm+Arqyga7aXbn94mk04YzxA6JuEYQEBiSfu4aIEYVPVX5uoXZ2VB20FO6p2b5ZZ 9Dyees9vg+1wPSi3Wy07P0e9u+rZtNPUQtuffZ6o3TTakH32cVW3sj3eon3zfcu8ctGfmZ OgTLDGH5g6Y4KR2chGFqqYZm9BKZkgdQ7mlY9gG+x9WuU1OnwRIom/y13yu3Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675955833; a=rsa-sha256; cv=none; b=suvU4Y6c3IfHTGEcSeqkNCzqLlIBZdVWShX3w0GHrZ81Z97/fKqZvJxEz1Hz5OIKZi329x W5eOn+0r8u3OwPIzCoKXhATjzkdrZFbAWNljLq5oIGSgILKjETwWnDrfD9TWWcSd1V1wNL O5YB3I7zv55Hmb342SQHS14iFcKG/CldaHUpWJKTpHbDl3airGBGmIlg5SitqBf/VwNF0X WRPDwfvKE8zwopmehV0D8bPSZsWog9yMxkNd+xNDyHXykCTWglwdoRxa0ecJwRfsx1j35e 7EQLWh6ZSmoRhH7LvW0oD2tQJQ4slkfLs/jjZpEgVcQQIT0cg68A2ozAyEmK+A== 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 4PCL7s0PCdzhlD; Thu, 9 Feb 2023 15:17:13 +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 319FHCvm022157; Thu, 9 Feb 2023 15:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319FHC1O022156; Thu, 9 Feb 2023 15:17:12 GMT (envelope-from git) Date: Thu, 9 Feb 2023 15:17:12 GMT Message-Id: <202302091517.319FHC1O022156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 08b0c98006b6 - main - atomic: Fix the atomic_load_ptr() *SAN interceptor List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08b0c98006b6b9f3722df0ce462f6a4aa8ee06f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=08b0c98006b6b9f3722df0ce462f6a4aa8ee06f2 commit 08b0c98006b6b9f3722df0ce462f6a4aa8ee06f2 Author: Mark Johnston AuthorDate: 2023-02-09 14:54:52 +0000 Commit: Mark Johnston CommitDate: 2023-02-09 15:16:34 +0000 atomic: Fix the atomic_load_ptr() *SAN interceptor The interceptor didn't handle a pointer of type "foo * const *" and in that case we'd get compiler errors 1) an invalid cast to volatile uintptr_t, and 2) an assignment to a variable of type "foo * const" (__retptr). Reported by: mjg MFC after: 1 week --- sys/sys/atomic_san.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/sys/atomic_san.h b/sys/sys/atomic_san.h index beeea82a666b..3a72cb4b4980 100644 --- a/sys/sys/atomic_san.h +++ b/sys/sys/atomic_san.h @@ -267,17 +267,11 @@ ATOMIC_SAN_THREAD_FENCE(SAN_INTERCEPTOR_PREFIX); #define atomic_fcmpset_acq_ptr ATOMIC_SAN(fcmpset_acq_ptr) #define atomic_fcmpset_rel_ptr ATOMIC_SAN(fcmpset_rel_ptr) #define atomic_fetchadd_ptr ATOMIC_SAN(fetchadd_ptr) -#define atomic_load_ptr(x) ({ \ - __typeof(*x) __retptr; \ - __retptr = (void *)ATOMIC_SAN(load_ptr)((volatile uintptr_t *)(x)); \ - __retptr; \ -}) +#define atomic_load_ptr(x) \ + ((void *)ATOMIC_SAN(load_ptr)(__DECONST(volatile uintptr_t *, (x)))) #define atomic_load_acq_ptr ATOMIC_SAN(load_acq_ptr) -#define atomic_load_consume_ptr(x) ({ \ - __typeof(*x) __retptr; \ - __retptr = (void *)atomic_load_acq_ptr((volatile uintptr_t *)(x));\ - __retptr; \ -}) +#define atomic_load_consume_ptr(x) \ + ((void *)atomic_load_acq_ptr((volatile uintptr_t *)(x))) #define atomic_readandclear_ptr ATOMIC_SAN(readandclear_ptr) #define atomic_set_ptr ATOMIC_SAN(set_ptr) #define atomic_set_acq_ptr ATOMIC_SAN(set_acq_ptr)