From: david.laight.linux@gmail.com
To: Kees Cook <kees@kernel.org>,
linux-hardening@vger.kernel.org, linux-afs@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@kernel.org>,
David Howells <dhowells@redhat.com>,
Marc Dionne <marc.dionne@auristor.com>,
David Laight <david.laight.linux@gmail.com>
Subject: [PATCH next] afs_lookup_atsys(): Use memcpy() instead of strcpy()
Date: Mon, 8 Jun 2026 10:55:22 +0100 [thread overview]
Message-ID: <20260608095523.2606-38-david.laight.linux@gmail.com> (raw)
From: David Laight <david.laight.linux@gmail.com>
strlen() has been called to validate the length, use the same length
to copy the string.
Signed-off-by: David Laight <david.laight.linux@gmail.com>
---
This is one of a group of patches that remove potentially unbounded
strcpy() calls.
They are mostly replaced by strscpy() or, when strlen() has just been
called, with memcpy() (usually including the '\0').
Calls with copy string literals into arrays are left unchanged.
They are safe and easily detected as such.
The changes were made by getting the compiler to detect the calls and
then fixing the code by hand.
Note that all the changes are only compile tested.
Some Makefiles were changed to allow files to contain strcpy().
As well as 'difficult to fix' files, this included 'show' functions
as they really need to use sysfs_emit() or seq_printf().
All the patches are being sent individually to avoid very long cc lists.
Apologies for the terse commit messages and likely unexpected tags.
(There are about 100 patches in total.)
fs/afs/dir.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index aaaa55878ffd..41aa6a4b0987 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -914,7 +914,7 @@ static struct dentry *afs_lookup_atsys(struct inode *dir, struct dentry *dentry)
struct afs_net *net = afs_i2net(dir);
struct dentry *ret;
char *buf, *p, *name;
- int len, i;
+ int name_len, len, i;
_enter("");
@@ -935,13 +935,14 @@ static struct dentry *afs_lookup_atsys(struct inode *dir, struct dentry *dentry)
for (i = 0; i < subs->nr; i++) {
name = subs->subs[i];
- len = dentry->d_name.len - 4 + strlen(name);
+ name_len = strlen(name);
+ len = dentry->d_name.len - 4 + name_len;
if (len >= AFSNAMEMAX) {
ret = ERR_PTR(-ENAMETOOLONG);
goto out_s;
}
- strcpy(p, name);
+ memcpy(p, name, name_len + 1);
ret = lookup_noperm(&QSTR(buf), dentry->d_parent);
if (IS_ERR(ret) || d_is_positive(ret))
goto out_s;
--
2.39.5
reply other threads:[~2026-06-08 9:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20260608095523.2606-38-david.laight.linux@gmail.com \
--to=david.laight.linux@gmail.com \
--cc=arnd@kernel.org \
--cc=dhowells@redhat.com \
--cc=kees@kernel.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.dionne@auristor.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.