2021-12-17 01:01:23

by Xiu Jianfeng

Subject: [PATCH -next, v3 1/2] audit: use struct_size() helper in audit_[send|make]_reply()

Make use of struct_size() helper instead of an open-coded calculation.

Link: https://github.com/KSPP/linux/issues/160
Signed-off-by: Xiu Jianfeng <[email protected]>
---
kernel/audit.c | 2 +-
kernel/auditfilter.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index f33028578c60..7778eca34837 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1459,7 +1459,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
security_release_secctx(ctx, len);
}
audit_send_reply(skb, seq, AUDIT_SIGNAL_INFO, 0, 0,
- sig_data, sizeof(*sig_data) + len);
+ sig_data, struct_size(sig_data, ctx, len));
kfree(sig_data);
break;
case AUDIT_TTY_GET: {
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 19352820b274..42d99896e7a6 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -1092,7 +1092,7 @@ static void audit_list_rules(int seq, struct sk_buff_head *q)
break;
skb = audit_make_reply(seq, AUDIT_LIST_RULES, 0, 1,
data,
- sizeof(*data) + data->buflen);
+ struct_size(data, buf, data->buflen));
if (skb)
skb_queue_tail(q, skb);
kfree(data);
--
2.17.1

2021-12-17 01:01:35

by Xiu Jianfeng

Subject: [PATCH -next, v3 2/2] audit: replace zero-length array with flexible-array member

Zero-length arrays are deprecated and should be replaced with
flexible-array members.

Link: https://github.com/KSPP/linux/issues/78
Signed-off-by: Xiu Jianfeng <[email protected]>
---
include/uapi/linux/audit.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
index 9176a095fefc..8eda133ca4c1 100644
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@ -514,7 +514,7 @@ struct audit_rule_data {
__u32 values[AUDIT_MAX_FIELDS];
__u32 fieldflags[AUDIT_MAX_FIELDS];
__u32 buflen; /* total length of string fields */
- char buf[0]; /* string fields buffer */
+ char buf[]; /* string fields buffer */
};

#endif /* _UAPI_LINUX_AUDIT_H_ */
--
2.17.1

2021-12-20 19:52:46

by Paul Moore

Subject: Re: [PATCH -next, v3 1/2] audit: use struct_size() helper in audit_[send|make]_reply()

On Thu, Dec 16, 2021 at 8:01 PM Xiu Jianfeng <[email protected]> wrote:
>
> Make use of struct_size() helper instead of an open-coded calculation.
>
> Link: https://github.com/KSPP/linux/issues/160
> Signed-off-by: Xiu Jianfeng <[email protected]>
> ---
> kernel/audit.c | 2 +-
> kernel/auditfilter.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)

Merged into audit/next, thanks!

--
paul moore
http://www.paul-moore.com

2021-12-20 21:20:30

by Paul Moore

Subject: Re: [PATCH -next, v3 2/2] audit: replace zero-length array with flexible-array member

On Thu, Dec 16, 2021 at 8:01 PM Xiu Jianfeng <[email protected]> wrote:
>
> Zero-length arrays are deprecated and should be replaced with
> flexible-array members.
>
> Link: https://github.com/KSPP/linux/issues/78
> Signed-off-by: Xiu Jianfeng <[email protected]>
> ---
> include/uapi/linux/audit.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

It doesn't look like this shouldn't impact the UAPI so I've also
merged into audit/next, thanks!

--
paul moore
http://www.paul-moore.com