1 files changed, 6 insertions, 6 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 6bc21fca20bc..f1e8c7f93e04 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1358,6 +1358,9 @@ static inline u64 file_mmap_size_max(struct file *file, struct inode *inode)
         if (S_ISBLK(inode->i_mode))
                 return MAX_LFS_FILESIZE;
 
+        if (S_ISSOCK(inode->i_mode))
+                return MAX_LFS_FILESIZE;
+
         /* Special "we do even unsigned file positions" case */
         if (file->f_mode & FMODE_UNSIGNED_OFFSET)
                 return 0;
@@ -2274,12 +2277,9 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
         if (vma) {
                 *pprev = vma->vm_prev;
         } else {
-                struct rb_node *rb_node = mm->mm_rb.rb_node;
-                *pprev = NULL;
-                while (rb_node) {
-                        *pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb);
-                        rb_node = rb_node->rb_right;
-                }
+                struct rb_node *rb_node = rb_last(&mm->mm_rb);
+
+                *pprev = rb_node ? rb_entry(rb_node, struct vm_area_struct, vm_rb) : NULL;
         }
         return vma;
 }