Skip to contentSkip to conversation

ksmbd: use kasprintf() in ksmbd_vfs_xattr_stream_name()

PATCH In review Dan Carpenter 2 participants 2 messages Jul 7, 2021 – Jul 8, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ksmbd: use kasprintf() in ksmbd_vfs_xattr_stream_name()

Simplify the code by using kasprintf(). This also silences a Smatch warning:

fs/ksmbd/vfs.c:1725 ksmbd_vfs_xattr_stream_name()
warn: inconsistent indenting

---
Not tested.

 fs/ksmbd/vfs.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)
fs/ksmbd/vfs.c +6 -21
index 0f5a4fb8215f..d3bab9235e9a 100644
@@ -1697,35 +1697,20 @@ ssize_t ksmbd_vfs_casexattr_len(struct user_namespace *user_ns,
 int ksmbd_vfs_xattr_stream_name(char *stream_name, char **xattr_stream_name,
 				size_t *xattr_stream_name_size, int s_type)
 {
-	int stream_name_size;
-	char *xattr_stream_name_buf;
-	char *type;
-	int type_len;
+	char *type, *buf;
 
 	if (s_type == DIR_STREAM)
 		type = ":$INDEX_ALLOCATION";
 	else
 		type = ":$DATA";
 
-	type_len = strlen(type);
-	stream_name_size = strlen(stream_name);
-	*xattr_stream_name_size = stream_name_size + XATTR_NAME_STREAM_LEN + 1;
-	xattr_stream_name_buf = kmalloc(*xattr_stream_name_size + type_len,
-					GFP_KERNEL);
-	if (!xattr_stream_name_buf)
+	buf = kasprintf(GFP_KERNEL, "%s%s%s",
+			XATTR_NAME_STREAM, stream_name,	type);
+	if (!buf)
 		return -ENOMEM;
 
-	memcpy(xattr_stream_name_buf, XATTR_NAME_STREAM, XATTR_NAME_STREAM_LEN);
-
-	if (stream_name_size) {
-		memcpy(&xattr_stream_name_buf[XATTR_NAME_STREAM_LEN],
-		       stream_name, stream_name_size);
-	}
-	memcpy(&xattr_stream_name_buf[*xattr_stream_name_size - 1], type, type_len);
-		*xattr_stream_name_size += type_len;
-
-	xattr_stream_name_buf[*xattr_stream_name_size - 1] = '\0';
-	*xattr_stream_name = xattr_stream_name_buf;
+	*xattr_stream_name = buf;
+	*xattr_stream_name_size = strlen(buf) + 1;
 
 	return 0;
 }
Signature · 1 line
2.30.2
#1 lore raw
Quoted 7 lines

Simplify the code by using kasprintf(). This also silences a Smatch warning:

fs/ksmbd/vfs.c:1725 ksmbd_vfs_xattr_stream_name()
warn: inconsistent indenting

Thanks for your patch. I will apply.