Skip to contentSkip to conversation

block: Replace deprecated strcpy() in devt_from_devname()

PATCH RESEND New Thorsten Blum 1 participant 1 message Jul 27 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 block: Replace deprecated strcpy() in devt_from_devname()

strcpy() is deprecated [1] and uses an additional strlen() internally; use memcpy() directly since we already know the length of name and that it is guaranteed to be NUL-terminated. Also use strnlen() and sizeof() instead of the hard-coded size while at it.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strcpy

---
 block/early-lookup.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
block/early-lookup.c +3 -2
index 3fb57f7d2b12..5c30a0cc85a0 100644
@@ -155,10 +155,11 @@ static int __init devt_from_devname(const char *name, dev_t *devt)
 	int part;
 	char s[32];
 	char *p;
+	size_t name_len = strnlen(name, sizeof(s));
 
-	if (strlen(name) > 31)
+	if (name_len == sizeof(s))
 		return -EINVAL;
-	strcpy(s, name);
+	memcpy(s, name, name_len + 1);
 	for (p = s; *p; p++) {
 		if (*p == '/')
 			*p = '!';