From nobody Fri Jan 12 21:12:07 2024 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 4TBZ3q4JZbz56Mtm; Fri, 12 Jan 2024 21:12:07 +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 4TBZ3q21FGz4WQj; Fri, 12 Jan 2024 21:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705093927; 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=fg46qU8p+4kGDY5h8eOjROVHNfSaGZH8f2o/KSreSb0=; b=ybpwXf3+cnWyJRdj5syfW7mq/l6nHVsaDAmqSr6FdkyswTFfDM7np4K3lUWOo5nciWSTQt oyXrcHaFOg2+DlOS2EXjkLAZqUjKyF7bi6tlic3HtRxosWvH0DW1xFjbPd/jydKyRLRjKk fV9c7H14t+KsFT4ooY4QIRFn3jGW5qrB2VnGySc7xkC4ahWMFKJmwy7grCgqOcHn4ByOzw tsw2ssKtIC1Y8w6yzkrm2FR2U5tSLvfaPqcbO8tuUqPVQQQTZxQ6ZMbha4y8X7/1VfoF+E JfdwRy0yUGoJ+5FHPYzoHfaITrYQaRlzKShoEmFG8ZJe0Yvd5C741StGYDfV9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705093927; 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=fg46qU8p+4kGDY5h8eOjROVHNfSaGZH8f2o/KSreSb0=; b=myrWmQE3DTmVWcmz1arVnCESXdVdXgMvxlGmh3RL1T7ztCi0KPIkLHs5k4n3GaOpTJsNhn g8EgV/HffB6smWp6J8395SLgXU82FMmFZdvNQA1ALm5AcsMqAiQDYfxxMdjGy3ovV4fHMM 0JySBh09baXG9KEiXjl4oMZQfXCniWCz5kd/hfCvkTpNkZWnXNtdsaosLMRUwdOshfyhkH mAbo8BQChMc7tGXpa81Yfh5czgO4Of6WZkE549el5Jyq2I0My1DovyYCljEJjz7x9+WDig EUb8Y1GKalpj8rZbe5St2xQs9MokSU7Re0Z0b+QGDCpDlzXOspBXIaYtLFaoYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705093927; a=rsa-sha256; cv=none; b=dj+GZtIKss3TEny3Ok+TFLgBlQ9jgMSfGvu1QCsNKR70DVGz1vkUj51Gtg0LAcO4oyrP5y qBOxAG+atI9y1Ux6ENNvZtCHutOcvq+IYm2ZeD5Hf7lyeJgrEy+MJ/eFkgtoqbpwNdE6cI GIrPLBk8p0Wf2igOX9dqwbQxtL7FfGQJfxVmn6hVWGx9IoxAhGCDjq25y83ne03pjUbNMC qsrmgHfYVSioz26oc3RWGFKTqb6/YauPtC4L7hDQLdUemzI/zd98YQ4CgUT80uPMPSiZTW 9kv+4wDF8Ean/C78FDl5Uc1pWKCI4UC5wRscNeHPhMtAjZOzjZn9pZksyjrWng== 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 4TBZ3q14zNz1HHg; Fri, 12 Jan 2024 21:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40CLC76r039273; Fri, 12 Jan 2024 21:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CLC7nM039270; Fri, 12 Jan 2024 21:12:07 GMT (envelope-from git) Date: Fri, 12 Jan 2024 21:12:07 GMT Message-Id: <202401122112.40CLC7nM039270@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: d07acc58d898 - main - systm: Relax __result_use_check annotations 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: d07acc58d8987e8e1205f4a82b77e847ea2d60d3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d07acc58d8987e8e1205f4a82b77e847ea2d60d3 commit d07acc58d8987e8e1205f4a82b77e847ea2d60d3 Author: Mark Johnston AuthorDate: 2024-01-12 15:07:28 +0000 Commit: Mark Johnston CommitDate: 2024-01-12 20:56:00 +0000 systm: Relax __result_use_check annotations When compiling with gcc, functions annotated this way can not have their return values cast away, e.g., with `(void)copyout(...)`. clang permits it but gcc does not. Since we have a number of such casts for calls which copy data out of the kernel, and since failing to check for errors when copying *in* is a much more severe bug, remove some of the annotations in order to make the gcc build happy. Reviewed by: kib Reported by: Jenkins Fixes: 8e36732e6eb5 ("systm: Annotate copyin() and related functions with __result_use_check") Differential Revision: https://reviews.freebsd.org/D43418 --- sys/sys/systm.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 2da177af91f0..508690cd639e 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -289,9 +289,9 @@ int __result_use_check copyin(const void * __restrict udaddr, void * _Nonnull __restrict kaddr, size_t len); int __result_use_check copyin_nofault(const void * __restrict udaddr, void * _Nonnull __restrict kaddr, size_t len); -int __result_use_check copyout(const void * _Nonnull __restrict kaddr, +int copyout(const void * _Nonnull __restrict kaddr, void * __restrict udaddr, size_t len); -int __result_use_check copyout_nofault(const void * _Nonnull __restrict kaddr, +int copyout_nofault(const void * _Nonnull __restrict kaddr, void * __restrict udaddr, size_t len); #ifdef SAN_NEEDS_INTERCEPTORS @@ -313,11 +313,11 @@ int64_t fuword64(volatile const void *base); int __result_use_check fueword(volatile const void *base, long *val); int __result_use_check fueword32(volatile const void *base, int32_t *val); int __result_use_check fueword64(volatile const void *base, int64_t *val); -int __result_use_check subyte(volatile void *base, int byte); -int __result_use_check suword(volatile void *base, long word); -int __result_use_check suword16(volatile void *base, int word); -int __result_use_check suword32(volatile void *base, int32_t word); -int __result_use_check suword64(volatile void *base, int64_t word); +int subyte(volatile void *base, int byte); +int suword(volatile void *base, long word); +int suword16(volatile void *base, int word); +int suword32(volatile void *base, int32_t word); +int suword64(volatile void *base, int64_t word); uint32_t casuword32(volatile uint32_t *base, uint32_t oldval, uint32_t newval); u_long casuword(volatile u_long *p, u_long oldval, u_long newval); int casueword32(volatile uint32_t *base, uint32_t oldval, uint32_t *oldvalp,