net/tls: Fix kmap usage
Subsystems (3)
PATCH 1/1 net/tls: Fix kmap usage
From: Ira Weiny <[email protected]>
When MSG_OOB is specified to tls_device_sendpage() the mapped page is never unmapped.
Hold off mapping the page until after the flags are checked and the page is actually needed.
--- net/tls/tls_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/tls/tls_device.c +2 -1
@@ -561,7 +561,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page, {struct tls_context *tls_ctx =tls_get_ctx (sk);struct iov_iter msg_iter; -char *kaddr =kmap (page); +char *kaddr;struct kvec iov;int rc;
@@ -576,6 +576,7 @@ int tls_device_sendpage(struct sock *sk, struct page *page, goto out; } + kaddr =kmap (page); iov.iov_base = kaddr + offset; iov.iov_len = size;iov_iter_kvec (&msg_iter,WRITE , &iov,1 , size);
Signature · 1 line
2.28.0.rc0.12.gb6a658bd00c9
Quoted 4 lines · On Mon, 10 Aug 2020 17:02:58 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
When
MSG_OOBis specified totls_device_sendpage()the mapped page is never unmapped.
Nice catch!
Quoted 2 lines
Hold off mapping the page until after the flags are checked and the page is actually needed.
We could take the kmap/kunmap from under the socket lock, but that'd perhaps be more code reshuffling than we need in a fix.
David Miller
maintainerFrom: [email protected]
Date: Mon, 10 Aug 2020 17:02:58 -0700
Quoted 9 lines
From: Ira Weiny <[email protected]>
When
MSG_OOBis specified totls_device_sendpage()the mapped page is never unmapped.Hold off mapping the page until after the flags are checked and the page is actually needed.
Signed-off-by Ira Weiny <[email protected]>
Applied and queued up for -stable, thank you.