]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: use kvzalloc instead of kvmalloc
authorNamjae Jeon <linkinjeon@kernel.org>
Mon, 18 Dec 2023 15:34:08 +0000 (00:34 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Dec 2023 09:41:56 +0000 (10:41 +0100)
[ Upstream commit 81a94b27847f7d2e499415db14dd9dc7c22b19b0 ]

Use kvzalloc instead of kvmalloc.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ksmbd/smb2pdu.c
fs/ksmbd/transport_ipc.c
fs/ksmbd/vfs.c

index 59b3f41fa8c485195272fa6ceca3f03ecf587272..022ac4ddf2d3853e7d62bf324d8f17f7e91f6ae9 100644 (file)
@@ -544,7 +544,7 @@ int smb2_allocate_rsp_buf(struct ksmbd_work *work)
        if (le32_to_cpu(hdr->NextCommand) > 0)
                sz = large_sz;
 
-       work->response_buf = kvmalloc(sz, GFP_KERNEL | __GFP_ZERO);
+       work->response_buf = kvzalloc(sz, GFP_KERNEL);
        if (!work->response_buf)
                return -ENOMEM;
 
@@ -6104,7 +6104,7 @@ static noinline int smb2_read_pipe(struct ksmbd_work *work)
                }
 
                work->aux_payload_buf =
-                       kvmalloc(rpc_resp->payload_sz, GFP_KERNEL | __GFP_ZERO);
+                       kvmalloc(rpc_resp->payload_sz, GFP_KERNEL);
                if (!work->aux_payload_buf) {
                        err = -ENOMEM;
                        goto out;
@@ -6261,7 +6261,7 @@ int smb2_read(struct ksmbd_work *work)
        ksmbd_debug(SMB, "filename %pD, offset %lld, len %zu\n",
                    fp->filp, offset, length);
 
-       work->aux_payload_buf = kvmalloc(length, GFP_KERNEL | __GFP_ZERO);
+       work->aux_payload_buf = kvzalloc(length, GFP_KERNEL);
        if (!work->aux_payload_buf) {
                err = -ENOMEM;
                goto out;
@@ -6410,7 +6410,7 @@ static ssize_t smb2_write_rdma_channel(struct ksmbd_work *work,
        int ret;
        ssize_t nbytes;
 
-       data_buf = kvmalloc(length, GFP_KERNEL | __GFP_ZERO);
+       data_buf = kvzalloc(length, GFP_KERNEL);
        if (!data_buf)
                return -ENOMEM;
 
index a8313eed4f10da661537814858e1821c5eec62bb..9560c704033e4ac747023245bf62c25201d825d9 100644 (file)
@@ -228,7 +228,7 @@ static struct ksmbd_ipc_msg *ipc_msg_alloc(size_t sz)
        struct ksmbd_ipc_msg *msg;
        size_t msg_sz = sz + sizeof(struct ksmbd_ipc_msg);
 
-       msg = kvmalloc(msg_sz, GFP_KERNEL | __GFP_ZERO);
+       msg = kvzalloc(msg_sz, GFP_KERNEL);
        if (msg)
                msg->sz = sz;
        return msg;
@@ -267,7 +267,7 @@ static int handle_response(int type, void *payload, size_t sz)
                               entry->type + 1, type);
                }
 
-               entry->response = kvmalloc(sz, GFP_KERNEL | __GFP_ZERO);
+               entry->response = kvzalloc(sz, GFP_KERNEL);
                if (!entry->response) {
                        ret = -ENOMEM;
                        break;
index 540c147411946c257213f408be73eb74a5aa34ad..2b938ebdfd2aa884c85d02b4733ac72b87633f5e 100644 (file)
@@ -436,7 +436,7 @@ static int ksmbd_vfs_stream_write(struct ksmbd_file *fp, char *buf, loff_t *pos,
        }
 
        if (v_len < size) {
-               wbuf = kvmalloc(size, GFP_KERNEL | __GFP_ZERO);
+               wbuf = kvzalloc(size, GFP_KERNEL);
                if (!wbuf) {
                        err = -ENOMEM;
                        goto out;
@@ -853,7 +853,7 @@ ssize_t ksmbd_vfs_listxattr(struct dentry *dentry, char **list)
        if (size <= 0)
                return size;
 
-       vlist = kvmalloc(size, GFP_KERNEL | __GFP_ZERO);
+       vlist = kvzalloc(size, GFP_KERNEL);
        if (!vlist)
                return -ENOMEM;