git: 6ee6c7b14664 - main - acl_copyin: avoid returning uninitialized memory

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=6ee6c7b146643170602091e8c330314e4ef47b42

commit 6ee6c7b146643170602091e8c330314e4ef47b42
Author:     Pierre Pronchery <pierre@freebsdfoundation.org>
AuthorDate: 2024-07-25 12:44:17 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-08-09 14:40:59 +0000

    acl_copyin: avoid returning uninitialized memory
    
    acl_copyin did not validate the return value of acl_copy_oldacl_into_acl
    which could lead to uninitialized acl structure memory reads.
    
    Reported by:    Synacktiv
    Reviewed by:    markj, emaste
    Sponsored by:   The Alpha-Omega Project
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D46125
---
 sys/kern/vfs_acl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c
index 20a58be02948..fde05478d41c 100644
--- a/sys/kern/vfs_acl.c
+++ b/sys/kern/vfs_acl.c
@@ -145,7 +145,7 @@ acl_copyin(const void *user_acl, struct acl *kernel_acl, acl_type_t type)
 		error = copyin(user_acl, &old, sizeof(old));
 		if (error != 0)
 			break;
-		acl_copy_oldacl_into_acl(&old, kernel_acl);
+		error = acl_copy_oldacl_into_acl(&old, kernel_acl);
 		break;
 
 	default: