From: Mark Brown <broonie@kernel.org>
To: Paul Moore <paul@paul-moore.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Kees Cook <keescook@chromium.org>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org,
Aishwarya TCV <aishwarya.tcv@arm.com>,
Mark Brown <broonie@kernel.org>
Subject: [PATCH v2] lsm: Add a __counted_by() annotation to lsm_ctx.ctx
Date: Fri, 22 Dec 2023 14:54:37 +0000 [thread overview]
Message-ID: <20231222-lsm-fix-counted-by-v2-1-f1237a095bdc@kernel.org> (raw)
The ctx in struct lsm_ctx is an array of size ctx_len, tell the compiler
about this using __counted_by() where supported to improve the ability to
detect overflow issues.
Reported-by: Aishwarya TCV <aishwarya.tcv@arm.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
Changes in v2:
- Add explicit stddef.h inclusion in case __counted_by() definition
isn't otherwise pulled in.
- Link to v1: https://lore.kernel.org/r/20231221-lsm-fix-counted-by-v1-1-12cc27597cdf@kernel.org
---
include/uapi/linux/lsm.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/lsm.h b/include/uapi/linux/lsm.h
index f0386880a78e..f8aef9ade549 100644
--- a/include/uapi/linux/lsm.h
+++ b/include/uapi/linux/lsm.h
@@ -9,6 +9,7 @@
#ifndef _UAPI_LINUX_LSM_H
#define _UAPI_LINUX_LSM_H
+#include <linux/stddef.h>
#include <linux/types.h>
#include <linux/unistd.h>
@@ -36,7 +37,7 @@ struct lsm_ctx {
__u64 flags;
__u64 len;
__u64 ctx_len;
- __u8 ctx[];
+ __u8 ctx[] __counted_by(ctx_len);
};
/*
---
base-commit: ec4e9d630a64df500641892f4e259e8149594a99
change-id: 20231221-lsm-fix-counted-by-f9fd827e26aa
Best regards,
--
Mark Brown <broonie@kernel.org>
next reply other threads:[~2023-12-22 14:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-22 14:54 Mark Brown [this message]
2023-12-22 23:00 ` [PATCH v2] lsm: Add a __counted_by() annotation to lsm_ctx.ctx Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231222-lsm-fix-counted-by-v2-1-f1237a095bdc@kernel.org \
--to=broonie@kernel.org \
--cc=aishwarya.tcv@arm.com \
--cc=gustavoars@kernel.org \
--cc=jmorris@namei.org \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=serge@hallyn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).