linux-cifs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ksmbd: use kasprintf() in ksmbd_vfs_xattr_stream_name()
@ 2021-07-07 10:15 ` Dan Carpenter
  2021-07-08  0:35   ` Namjae Jeon
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2021-07-07 10:15 UTC (permalink / raw)
  To: Namjae Jeon
  Cc: Sergey Senozhatsky, Steve French, Hyunchul Lee, linux-cifs,
	kernel-janitors

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

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Not tested.

 fs/ksmbd/vfs.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/fs/ksmbd/vfs.c b/fs/ksmbd/vfs.c
index 0f5a4fb8215f..d3bab9235e9a 100644
--- a/fs/ksmbd/vfs.c
+++ b/fs/ksmbd/vfs.c
@@ -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;
 }
-- 
2.30.2


^ permalink raw reply	[flat|nested] 2+ messages in thread

* RE: [PATCH] ksmbd: use kasprintf() in ksmbd_vfs_xattr_stream_name()
  2021-07-07 10:15 ` [PATCH] ksmbd: use kasprintf() in ksmbd_vfs_xattr_stream_name() Dan Carpenter
@ 2021-07-08  0:35   ` Namjae Jeon
  0 siblings, 0 replies; 2+ messages in thread
From: Namjae Jeon @ 2021-07-08  0:35 UTC (permalink / raw)
  To: 'Dan Carpenter'
  Cc: 'Sergey Senozhatsky', 'Steve French',
	'Hyunchul Lee',
	linux-cifs, kernel-janitors

> 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
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks for your patch. I will apply.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-07-08  0:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <CGME20210707101617epcas1p12eede31054d5985ad00297f45102bcd5@epcas1p1.samsung.com>
2021-07-07 10:15 ` [PATCH] ksmbd: use kasprintf() in ksmbd_vfs_xattr_stream_name() Dan Carpenter
2021-07-08  0:35   ` Namjae Jeon

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox