Merge tag 'char-misc-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc (a03885d5) · Commits · 戴 / test

drivers/android/binder.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -97,10 +97,6 @@ DEFINE_SHOW_ATTRIBUTE(proc);
		#define SZ_1K 0x400
		#endif

		#ifndef SZ_4M
		#define SZ_4M 0x400000
		#endif

		#define FORBIDDEN_MMAP_FLAGS (VM_WRITE)

		enum {
		@@ -5177,9 +5173,6 @@ static int binder_mmap(struct file filp, struct vm_area_struct vma)
		if (proc->tsk != current->group_leader)
		return -EINVAL;

		if ((vma->vm_end - vma->vm_start) > SZ_4M)
		vma->vm_end = vma->vm_start + SZ_4M;

		binder_debug(BINDER_DEBUG_OPEN_CLOSE,
		"%s: %d %lx-%lx (%ld K) vma %lx pagep %lx\n",
		__func__, proc->pid, vma->vm_start, vma->vm_end,

+4 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <asm/cacheflush.h>
		#include <linux/uaccess.h>
		#include <linux/highmem.h>
		#include <linux/sizes.h>
		#include "binder_alloc.h"
		#include "binder_trace.h"

		@@ -689,7 +690,9 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc,
		alloc->buffer = (void __user *)vma->vm_start;
		mutex_unlock(&binder_alloc_mmap_lock);

		alloc->pages = kcalloc((vma->vm_end - vma->vm_start) / PAGE_SIZE,
		alloc->buffer_size = min_t(unsigned long, vma->vm_end - vma->vm_start,
		SZ_4M);
		alloc->pages = kcalloc(alloc->buffer_size / PAGE_SIZE,
		sizeof(alloc->pages[0]),
		GFP_KERNEL);
		if (alloc->pages == NULL) {
		@@ -697,7 +700,6 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc,
		failure_string = "alloc page array";
		goto err_alloc_pages_failed;
		}
		alloc->buffer_size = vma->vm_end - vma->vm_start;

		buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
		if (!buffer) {