Merge "msm: fbdev: add safety check for msm fb data object" (9c0706c9) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/video/fbdev/msm/mdss_fb.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		* Core MDSS framebuffer driver.
		*
		* Copyright (C) 2007 Google Incorporated
		* Copyright (c) 2008-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2008-2019, The Linux Foundation. All rights reserved.
		*
		* This software is licensed under the terms of the GNU General Public
		* License version 2, as published by the Free Software Foundation, and
		@@ -3579,6 +3579,9 @@ static int mdss_fb_pan_display_sub(struct fb_var_screeninfo *var,
		{
		struct msm_fb_data_type mfd = (struct msm_fb_data_type )info->par;

		if (!mfd)
		return -EPERM;

		if (!mfd->op_enable)
		return -EPERM;