summaryrefslogtreecommitdiffstats
path: root/fs/cifsd/vfs.c
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2021-05-31 10:25:05 +0200
committerNamjae Jeon <namjae.jeon@samsung.com>2021-06-01 02:26:20 +0200
commitfd6de099d7fabc2b86f51dc622453eb279f7cce9 (patch)
tree0487242c917d5d85bf6183516e163119190319af /fs/cifsd/vfs.c
parentcifsd: fix memleak in ksmbd_vfs_stream_read() (diff)
downloadlinux-fd6de099d7fabc2b86f51dc622453eb279f7cce9.tar.xz
linux-fd6de099d7fabc2b86f51dc622453eb279f7cce9.zip
cifsd: check return value of ksmbd_vfs_getcasexattr() correctly
If ksmbd_vfs_getcasexattr() returns -ENOMEM, stream_buf is NULL, it will cause null-ptr-deref when using it to copy memory. So we need check the return value of ksmbd_vfs_getcasexattr() by comparing with 0. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to '')
-rw-r--r--fs/cifsd/vfs.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/cifsd/vfs.c b/fs/cifsd/vfs.c
index 85872416bf9b..56b1091473b9 100644
--- a/fs/cifsd/vfs.c
+++ b/fs/cifsd/vfs.c
@@ -274,7 +274,6 @@ static int ksmbd_vfs_stream_read(struct ksmbd_file *fp, char *buf, loff_t *pos,
{
ssize_t v_len;
char *stream_buf = NULL;
- int err;
ksmbd_debug(VFS, "read stream data pos : %llu, count : %zd\n",
*pos, count);
@@ -283,11 +282,8 @@ static int ksmbd_vfs_stream_read(struct ksmbd_file *fp, char *buf, loff_t *pos,
fp->stream.name,
fp->stream.size,
&stream_buf);
- if (v_len == -ENOENT) {
- ksmbd_err("not found stream in xattr : %zd\n", v_len);
- err = -ENOENT;
- return err;
- }
+ if ((int)v_len <= 0)
+ return (int)v_len;
memcpy(buf, &stream_buf[*pos], count);
kvfree(stream_buf);
@@ -415,9 +411,9 @@ static int ksmbd_vfs_stream_write(struct ksmbd_file *fp, char *buf, loff_t *pos,
fp->stream.name,
fp->stream.size,
&stream_buf);
- if (v_len == -ENOENT) {
+ if ((int)v_len < 0) {
ksmbd_err("not found stream in xattr : %zd\n", v_len);
- err = -ENOENT;
+ err = (int)v_len;
goto out;
}