Merge "drm/msm/dsi-staging: add null check for user length" into dev/msm-4.14-display

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1166,6 +1166,9 @@ static ssize_t debugfs_esd_trigger_check(struct file *file,
		if (user_len > sizeof(u32))
		return -EINVAL;

		if (!user_len \|\| !user_buf)
		return -EINVAL;

		buf = kzalloc(user_len, GFP_KERNEL);
		if (!buf)
		return -ENOMEM;