audit: Replace deprecated strcpy() with strscpy()

[PATCH] audit: Replace deprecated strcpy() with strscpy()

Posted by Thorsten Blum 2 months, 2 weeks ago

strcpy() is deprecated; use strscpy() instead.

Link: https://github.com/KSPP/linux/issues/88
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 kernel/audit_tree.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index b0eae2a3c895..1605df0a171e 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -93,8 +93,10 @@ static struct kmem_cache *audit_tree_mark_cachep __ro_after_init;
 static struct audit_tree *alloc_tree(const char *s)
 {
 	struct audit_tree *tree;
+	size_t sz;
 
-	tree = kmalloc(struct_size(tree, pathname, strlen(s) + 1), GFP_KERNEL);
+	sz = strlen(s) + 1;
+	tree = kmalloc(struct_size(tree, pathname, sz), GFP_KERNEL);
 	if (tree) {
 		refcount_set(&tree->count, 1);
 		tree->goner = 0;
@@ -103,7 +105,7 @@ static struct audit_tree *alloc_tree(const char *s)
 		INIT_LIST_HEAD(&tree->list);
 		INIT_LIST_HEAD(&tree->same_root);
 		tree->root = NULL;
-		strcpy(tree->pathname, s);
+		strscpy(tree->pathname, s, sz);
 	}
 	return tree;
 }
-- 
2.50.1

Re: [PATCH] audit: Replace deprecated strcpy() with strscpy()

Posted by Paul Moore 2 months, 2 weeks ago

On Fri, Jul 18, 2025 at 4:38 PM Thorsten Blum <thorsten.blum@linux.dev> wrote:
>
> strcpy() is deprecated; use strscpy() instead.
>
> Link: https://github.com/KSPP/linux/issues/88
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
>  kernel/audit_tree.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

This looks fine to me, but as we are at -rc6 I'm going to hold off on
merging this until after the upcoming merge window.

-- 
paul-moore.com

Re: [PATCH] audit: Replace deprecated strcpy() with strscpy()

Posted by Paul Moore 2 months ago

On Fri, Jul 18, 2025 at 5:52 PM Paul Moore <paul@paul-moore.com> wrote:
> On Fri, Jul 18, 2025 at 4:38 PM Thorsten Blum <thorsten.blum@linux.dev> wrote:
> >
> > strcpy() is deprecated; use strscpy() instead.
> >
> > Link: https://github.com/KSPP/linux/issues/88
> > Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> > ---
> >  kernel/audit_tree.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
>
> This looks fine to me, but as we are at -rc6 I'm going to hold off on
> merging this until after the upcoming merge window.

Merged into audit/dev-staging for testing, audit/dev will happen after
merge window closes.

-- 
paul-moore.com

Re: [PATCH] audit: Replace deprecated strcpy() with strscpy()

Posted by Paul Moore 1 month, 3 weeks ago

On Tue, Aug 5, 2025 at 3:57 PM Paul Moore <paul@paul-moore.com> wrote:
> On Fri, Jul 18, 2025 at 5:52 PM Paul Moore <paul@paul-moore.com> wrote:
> > On Fri, Jul 18, 2025 at 4:38 PM Thorsten Blum <thorsten.blum@linux.dev> wrote:
> > >
> > > strcpy() is deprecated; use strscpy() instead.
> > >
> > > Link: https://github.com/KSPP/linux/issues/88
> > > Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> > > ---
> > >  kernel/audit_tree.c | 6 ++++--
> > >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > This looks fine to me, but as we are at -rc6 I'm going to hold off on
> > merging this until after the upcoming merge window.
>
> Merged into audit/dev-staging for testing, audit/dev will happen after
> merge window closes.

Merged into audit/dev, thanks!

-- 
paul-moore.com