diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-02 14:34:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-02 14:34:00 -0700 |
| commit | 56cfd2507d3e720f4b1dbf9513e00680516a0826 (patch) | |
| tree | 3314c4464a9fe82547fefb98d5536b7ba55fdbd8 | |
| parent | 9d2345057538bb97b1e556508ad69983f446462f (diff) | |
| parent | a08d897bc04f23c608dadde5c31ef194911e78bb (diff) | |
| download | linux-56cfd2507d3e720f4b1dbf9513e00680516a0826.tar.bz2 | |
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
| -rw-r--r-- | fs/cifs/smb2ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 4c0922596467..cd55af9b7cc5 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -4084,6 +4084,7 @@ free_pages: kfree(dw->ppages); 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, dw->server = server; dw->ppages = pages; 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 */ return -1; } |