From nobody Mon Sep 09 22:58:04 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 4X2j0r6Gyvz5Vs3Y; Mon, 09 Sep 2024 22:58:04 +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 4X2j0r4FN3z4FWg; Mon, 9 Sep 2024 22:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725922684; 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=evvAVsAZqcPNOQtD/PQc/RhDa7M10nY2S3+Kc1tzhQQ=; b=PFayMAp1yAzitr8xMW17hvAc72F3J0KuE5ZIKEmo9RDKVV/2NSlYumymL1tAqADpXcqu+j uX+zULmwdauE9jU77qpXFdBSwcOQceZoXJQTma0w3ocsIdHz2a8NNzN1q/8/x12lNMKWHX 8jLbgNDHKX5A37FPCKkKWV40+V5vgEsFqG5Kv9ZSD9IW6fyHbo5HD4qzEqiowZTRJO8nR1 P7OtKNXUhVtcSZcZy38DCLEI7ZyJUcajupN+1KpZrw/JnNBm0ezW14GlORQ5nN4pVNnvZh 4i7tJuaUl3XYExIPYMF0g408yBmauE601J561VIlC1d2SE15oDzZgxfCCiQxiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725922684; a=rsa-sha256; cv=none; b=QexILXZKTr4oX0Blg0KvGLpoUqcWDe39dWw4AS8HMho810v2YYFtBPrT9Lyw8hw7GI/bmA NFP84F2RRaqT/Jc6ddrHDUTE0rSFsp2gXucIJttobrTpWBYHU7+1axOEbonw5gEIeDsixF 8Pq92cX2WPaWmmR1Ez4bA5UwFAKZCRxlWLNEVd9CAFYWWogN7TYhMOTGlAA69Bz5XS+huM 7kG88J+s8XfnYI45En/xO0mQKElOSNGj7VZBwgX/+ATbkFbgtIx1iVCXxIZJEcwW+XgS1S mdpubvbZEqx08bV7YEUyUgCyhkhowuP+Z8frZ8HhSMrDbEDBTZ5THXUgDEvJKA== 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=1725922684; 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=evvAVsAZqcPNOQtD/PQc/RhDa7M10nY2S3+Kc1tzhQQ=; b=etq/j3moRv+JI0gjbNojpYHXht321l8HcrlXACjlH+D/HA6J0zYBZLuFmW8DRhrsdnMtIP 4IXEDDrhmS5cLFEH2UFfn/ZiAvSMQDRExOTNauxwpBkxjRH4x7vL1jaDgThxAaAmlb2nV/ aDgjFWnUN/nu9WkbFIcl7sEbWyZ0e/XPSFP5VrMfAIV3Egym/M3W3gg5O3Wh0qsdVCLw7N fT9HA44IcQpIeFUuS2zZhCFBX3UJClQ9ZP1teRpPJTu+0VidmmRYvtaKPADUJon8hyvcCo 0DkKBsvyMMsyxa4p75YW4I4CP2xWszhooksh8JbvlSgvUQuamgexVo1BP0+m6g== 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 4X2j0r2SDzzMwM; Mon, 9 Sep 2024 22:58:04 +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 489Mw4Hh042165; Mon, 9 Sep 2024 22:58:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 489Mw4QE042162; Mon, 9 Sep 2024 22:58:04 GMT (envelope-from git) Date: Mon, 9 Sep 2024 22:58:04 GMT Message-Id: <202409092258.489Mw4QE042162@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: df2f5112be9b - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: df2f5112be9be5a0e3c6e94de1fa27613940cc93 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=df2f5112be9be5a0e3c6e94de1fa27613940cc93 commit df2f5112be9be5a0e3c6e94de1fa27613940cc93 Author: Pierre Pronchery AuthorDate: 2024-08-09 17:37:38 +0000 Commit: Ed Maste CommitDate: 2024-09-09 20:09:36 +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) (cherry picked from commit 82fd9219755dac73e51289493e1f024b32bbb2cd) --- 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 fc804b86b16f..8e022e49d53b 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); /*