Merge "drm/msm/dsi-staging: add null check for user length" (a51143d1) · Commits · e / devices / android_kernel_fairphone_FP3

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

+4 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -1199,6 +1199,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;