diff options
| author | Ira Weiny <ira.weiny@intel.com> | 2020-08-10 17:02:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-11 10:20:34 -0700 |
| commit | b06c19d9f827f6743122795570bfc0c72db482b0 (patch) | |
| tree | b0fee16b5e902c40afff53b91688540a9b411b00 /net/tls | |
| parent | 444da3f52407d74c9aa12187ac6b01f76ee47d62 (diff) | |
| download | lwn-b06c19d9f827f6743122795570bfc0c72db482b0.tar.gz lwn-b06c19d9f827f6743122795570bfc0c72db482b0.zip | |
net/tls: Fix kmap usage
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.
Fixes: e8f69799810c ("net/tls: Add generic NIC offload infrastructure")
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tls')
| -rw-r--r-- | net/tls/tls_device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 18fa6067bb7f..b74e2741f74f 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -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); |