Merge "diag: Potential Null Pointer Dereference of user buf" (d52907fe) · Commits · e / devices / android_kernel_sony_msm8994

drivers/char/diag/diagchar_core.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1180,7 +1180,10 @@ static int diagchar_read(struct file file, char __user buf, size_t count,
		pr_err("diag: Client PID not found in table");
		return -EINVAL;
		}

		if (!buf) {
		pr_err("diag: bad address from user side\n");
		return -EFAULT;
		}
		wait_event_interruptible(driver->wait_q, driver->data_ready[index]);

		mutex_lock(&driver->diagchar_mutex);