Commit 56cfd250 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag '5.4-rc6-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fix from Steve French:
 "A small smb3 memleak fix"

* tag '5.4-rc6-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6:
  fix memory leak in large read decrypt offload
parents 9d234505 a08d897b
...@@ -4084,6 +4084,7 @@ static void smb2_decrypt_offload(struct work_struct *work) ...@@ -4084,6 +4084,7 @@ static void smb2_decrypt_offload(struct work_struct *work)
kfree(dw->ppages); kfree(dw->ppages);
cifs_small_buf_release(dw->buf); cifs_small_buf_release(dw->buf);
kfree(dw);
} }
...@@ -4157,7 +4158,7 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid, ...@@ -4157,7 +4158,7 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid,
dw->server = server; dw->server = server;
dw->ppages = pages; dw->ppages = pages;
dw->len = len; dw->len = len;
queue_work(cifsiod_wq, &dw->decrypt); queue_work(decrypt_wq, &dw->decrypt);
*num_mids = 0; /* worker thread takes care of finding mid */ *num_mids = 0; /* worker thread takes care of finding mid */
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment