Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/cifs/smb2ops.c

+2 −1
Original line number Diff line number Diff line
@@ -4084,6 +4084,7 @@ static void smb2_decrypt_offload(struct work_struct *work) 


	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;

	}