From patchwork Mon Dec 2 01:42:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5p2O6LGq5p2w?= <15074444048@163.com> X-Patchwork-Id: 13889796 X-Patchwork-Delegate: paul@paul-moore.com Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.3]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6C2048489 for ; Mon, 2 Dec 2024 01:42:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733103741; cv=none; b=eyMWR/L3PGxxrZ3J1Ut7CGg0CuOOkAd9KpOFN8H2k+ie627jeAvqMA+wD4GYXXBubdXhFgBppB9Tn0OJ+CoRTpol9dgWmMcpAwshHU4erELlUTNeI9k8tlJjcPuWwDIezeyVC1lfJHQGk8Iz8alXbvi5H0KTw3cJ5CFz28vfCOU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733103741; c=relaxed/simple; bh=h37FQeWqEAfYDoNzAEiN61QOTKLR9s1TA0+T5JaWMVc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=fiVX1O5bYV7wADcSB+wjaee8S/Lt3l1fEYpXPCYy8DbfxgPiyy/FasSjUmDXxl/5C7QIbjSznFrtp22hXubISgNIC7Bz9apxv+cWWNOx/LWKBWix3lGVua1WmQiLIG+tW/hqhN1MhjzJS8h282gt6VG6pDxf5lUqkCfNPGK73JE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=hPOcwC/X; arc=none smtp.client-ip=220.197.31.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="hPOcwC/X" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=HStnT OZHnW8G3VwSWyU2OLVzOmApbcEaPS8zDDtrIno=; b=hPOcwC/XTfGlmMKB4arVA CYaR+TmFAiI6MlkCT0UhdAfTCkpZN603uT2jdr4Omv3fHEno/gXXXSsndaHLRZtt G2kr2gRDYuW51SqI4Zu9MbMFnp1Sjt3XRALvxHEA4s4nuQLTAJmnn5zpWpuv4syW /BYVnTz7HDyniPU0bE4wLo= Received: from localhost.localdomain (unknown []) by gzsmtp2 (Coremail) with SMTP id PSgvCgBH5jNxEE1nZ+gnAQ--.17654S2; Mon, 02 Dec 2024 09:42:10 +0800 (CST) From: 15074444048@163.com To: audit@vger.kernel.org, paul@paul-moore.com, eparis@redhat.com Cc: lihaojie Subject: [PATCH] kernel/audit: Use struct_group() for memcpy() region Date: Mon, 2 Dec 2024 09:42:17 +0800 Message-Id: <20241202014217.34580-1-15074444048@163.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: audit@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: PSgvCgBH5jNxEE1nZ+gnAQ--.17654S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF13tF17JrWfKw4xAryUGFg_yoW8uryUpF n8CayDGrW7JFy8Ar48AF4kuryYqw1rGw13GF93Jw1fAr98trykKF48KF47Was0y3WF9r92 9FsYvayaywsrJa7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jgNVgUUUUU= X-CM-SenderInfo: rprvilauuukiiuy6il2tof0z/1tbiLgqpUGdNDZZzZgAAs5 From: lihaojie In preparation for FORTIFY_SOURCE performing compile-time and run-time field bounds checking for memcpy(), memmove(), and memset(), avoid intentionally writing across neighboring fields. Use struct_group() in struct audit_context around members target_comm[], This will allow memcpy() and sizeof() to more easily reason about sizes, improve readability, and avoid future warnings about writing beyond the end of target_comm[]. "pahole" shows no size nor member offset changes to struct vlan_ethhdr. "objdump -d" shows no object code changes. Signed-off-by: lihaojie --- kernel/audit.h | 5 ++++- kernel/auditsc.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/audit.h b/kernel/audit.h index 0211cb307d30..20483670ea02 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -145,7 +145,10 @@ struct audit_context { kuid_t target_uid; unsigned int target_sessionid; struct lsm_prop target_ref; - char target_comm[TASK_COMM_LEN]; + + struct_group(comm, + char target_comm[TASK_COMM_LEN]; + ); struct audit_tree_refs *trees, *first_trees; struct list_head killed_trees; diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 91afdd0d036e..e279762463b0 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -2729,7 +2729,7 @@ void __audit_ptrace(struct task_struct *t) context->target_uid = task_uid(t); context->target_sessionid = audit_get_sessionid(t); security_task_getlsmprop_obj(t, &context->target_ref); - memcpy(context->target_comm, t->comm, TASK_COMM_LEN); + memcpy(&context->comm, t->comm, TASK_COMM_LEN); } /** @@ -2756,7 +2756,7 @@ int audit_signal_info_syscall(struct task_struct *t) ctx->target_uid = t_uid; ctx->target_sessionid = audit_get_sessionid(t); security_task_getlsmprop_obj(t, &ctx->target_ref); - memcpy(ctx->target_comm, t->comm, TASK_COMM_LEN); + memcpy(&ctx->comm, t->comm, TASK_COMM_LEN); return 0; }