net/tls: Fix kmap usage

[ Upstream commit b06c19d9f827f6743122795570bfc0c72db482b0 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index 1adeb1c0473b852cdb5c56e47f66387a26e8c6e3..25fca390cdcf5f4b44da10164c94d47df071d9b2 100644 (file)
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -549,7 +549,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;
 
@@ -564,6 +564,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);