From nobody Thu Sep 05 14:50:38 2024 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 4X02NH3X1gz5WB1j; Thu, 05 Sep 2024 14:50:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X02NH1N6mz4c9l; Thu, 5 Sep 2024 14:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725547839; 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=r/tSjF8iixQZBgi8ayJcP/gRVWpyuYvGQP9AWDeaJjY=; b=QwxpSTVgQKDeMqmhQBgrM5fCVSV6tKtfqQSTHABmlGmXluEUefq+ooz8RNmRzSED5g47yy wXAY0HEST8vM4/i9BReC5NKZO6Cst51eJm/HIjLrxp8gcTajPEOJ2ugfLn9uzoST4PHEwk u1eDbiCLVOhnFK7z35riN6x4GeimZRu1ivbkP/pB69TQsJSal5BJlqBsdEIYdQv9aWc4X/ LDM7MjZZoSrabUg2WrvckBVH4YdhCWcUf4aWVNVwyJqMeJqbkLEVoTaYlRpa36I27hGKyh COrpbFCVo88wgpmSU1+UtKRfY+89v4fiqVMlvHnRX4QqPSzSpuwfo06zG/BSFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725547839; a=rsa-sha256; cv=none; b=eq7TSRTy3qhNLOLMY51B4TUdvcgFKUKIZ5o4jZo7BMY4Rf6GpcyIkduIAzzDZZxS1LWvlF z1J1O+wisQo/bwIukUvRw/IR57zBeVjPJcyEim5egct2Qy/xCzA4sERVCXQR3aZ+PyH2pP pb45o+zW8JNofU/beu4tTueD4Ev/gnuxDEE7S54rUdRo0RyRlcH6kkyDlRRB9goi/3GNyu UvZ3/Uh4vYwzS3ocOR7WtuWocTtvX1X6d64Yu04PRoGPdQGenO+ErREW43lI4IK/f4jQZ3 9R9xwzB+qRIuduelCpNnQiev7BkjyVKTBWlNlygJpcacaYsvOkYtlbM4swl78A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725547839; 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=r/tSjF8iixQZBgi8ayJcP/gRVWpyuYvGQP9AWDeaJjY=; b=V8H/bzZqSe/e04S+dFk9NxsJBLC5QdZtkfzVz7vDzXRsJdl2/UUuuN9NfLWGZ5valpNtyY UeuycqntpApEKEnz7ftvmu+mqYR/vP6ohI3fAVoJsJLe1Jv7NJwtf+gbj7fKCvd3YWPl+u jSZw69U4Awmx6YS16ZQ3lDZxkCYMjVCZF/yYqZQ0cRl7TJIOs6p7LcZVhQlApsnh8GxSta YZqs7CBxeafrhTY5oxsGhtiHPNdSjBm0U9fdaDfaE+9qPzdgujNGTbdiWBKllnml1h2bXB vCNbloOZNsWySnRwCCoE9pTI9MKqNALuF4q2n4rIr6xxwzd+gBUBSac1N8voRQ== 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 4X02NG6vtbz1C5Y; Thu, 5 Sep 2024 14:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 485Eocbi076452; Thu, 5 Sep 2024 14:50:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485Eocuw076449; Thu, 5 Sep 2024 14:50:38 GMT (envelope-from git) Date: Thu, 5 Sep 2024 14:50:38 GMT Message-Id: <202409051450.485Eocuw076449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 82fd9219755d - stable/14 - sys: Mark ACL conversion routines as __result_use_check 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 82fd9219755dac73e51289493e1f024b32bbb2cd Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=82fd9219755dac73e51289493e1f024b32bbb2cd commit 82fd9219755dac73e51289493e1f024b32bbb2cd Author: Pierre Pronchery AuthorDate: 2024-08-09 17:37:38 +0000 Commit: Ed Maste CommitDate: 2024-09-05 14:50:09 +0000 sys: Mark ACL conversion routines as __result_use_check Both acl_copy_oldacl_into_acl() and acl_copy_acl_into_oldacl() may fail in some circumstances (e.g., acl.acl_cnt exceeding the capacity of OLDACL_MAX_ENTRIES). This change marks both routines with __result_use_check, enforcing check for errors by the caller. Suggested by: markj Reviewed by: markj, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46254 (cherry picked from commit ef9fc9609a1ff53047577aa7cf51246fc04c954b) --- sys/sys/acl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/acl.h b/sys/sys/acl.h index f679808dceca..b0d76404fffa 100644 --- a/sys/sys/acl.h +++ b/sys/sys/acl.h @@ -307,9 +307,9 @@ void acl_nfs4_compute_inherited_acl( const struct acl *parent_aclp, struct acl *child_aclp, mode_t mode, int file_owner_id, int is_directory); -int acl_copy_oldacl_into_acl(const struct oldacl *source, +int __result_use_check acl_copy_oldacl_into_acl(const struct oldacl *source, struct acl *dest); -int acl_copy_acl_into_oldacl(const struct acl *source, +int __result_use_check acl_copy_acl_into_oldacl(const struct acl *source, struct oldacl *dest); /*