Skip to content

Commit

Permalink
Merge tag '5.4-rc6-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Nov 2, 2019
2 parents 9d23450 + a08d897 commit 56cfd25
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/cifs/smb2ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -4084,6 +4084,7 @@ static void smb2_decrypt_offload(struct work_struct *work)

kfree(dw->ppages);
cifs_small_buf_release(dw->buf);
kfree(dw);
}


Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 56cfd25

Please sign in to comment.