Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[mirror_ubuntu-jammy-kernel.git] / net / ipv4 / tcp.c

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index ecbba0abd3e5b70212c54c0cbf9f20656180c13c..810cc164f795f8e1e8ca747ed5df51bb20fec8a2 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1734,7 +1734,7 @@ int tcp_mmap(struct file *file, struct socket *sock,
                return -EPERM;
        vma->vm_flags &= ~(VM_MAYWRITE | VM_MAYEXEC);
 
-       /* Instruct vm_insert_page() to not down_read(mmap_sem) */
+       /* Instruct vm_insert_page() to not mmap_read_lock(mm) */
        vma->vm_flags |= VM_MIXEDMAP;
 
        vma->vm_ops = &tcp_vm_ops;
@@ -1798,11 +1798,11 @@ static int tcp_zerocopy_receive(struct sock *sk,
 
        tp = tcp_sk(sk);
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
 
        vma = find_vma(current->mm, address);
        if (!vma || vma->vm_start > address || vma->vm_ops != &tcp_vm_ops) {
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
                return -EINVAL;
        }
        zc->length = min_t(unsigned long, zc->length, vma->vm_end - address);
@@ -1883,7 +1883,7 @@ static int tcp_zerocopy_receive(struct sock *sk,
                                                   zc);
        }
 out:
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
        if (length) {
                WRITE_ONCE(tp->copied_seq, seq);
                tcp_rcv_space_adjust(sk);