[Intel-gfx] [PATCH 4/5] Critical-KlockWork-Fix-intel_tv.c-Possible-Null

[Anshuman Gupta]

On 2020-08-19 at 10:04:08 +0530, Nischal Varide wrote:
> This patch fixes the Critical Klock work Error and in this case a
> Possible Null Pointer Dereference has been addressed with a Null check
> before dereferencing
> 
> Signed-off-by: Nischal Varide <nischal.varide at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_tv.c | 17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
> index 777032d9697b..5600d146ae81 100644
> --- a/drivers/gpu/drm/i915/display/intel_tv.c
> +++ b/drivers/gpu/drm/i915/display/intel_tv.c
> @@ -1836,17 +1836,20 @@ static int intel_tv_atomic_check(struct drm_connector *connector,
>  	struct drm_connector_state *old_state;
>  
>  	new_state = drm_atomic_get_new_connector_state(state, connector);
> -	if (!new_state->crtc)
> -		return 0;
> -
>  	old_state = drm_atomic_get_old_connector_state(state, connector);
>  	new_crtc_state = drm_atomic_get_new_crtc_state(state, new_state->crtc);
>  
> +	if (!(old_state && new_state && new_crtc_state))
> +		return 0;
> +
> +	if (!new_state->crtc)
> +		return 0;
> +
>  	if (old_state->tv.mode != new_state->tv.mode ||
> -	    old_state->tv.margins.left != new_state->tv.margins.left ||
> -	    old_state->tv.margins.right != new_state->tv.margins.right ||
> -	    old_state->tv.margins.top != new_state->tv.margins.top ||
> -	    old_state->tv.margins.bottom != new_state->tv.margins.bottom) {
> +		old_state->tv.margins.left != new_state->tv.margins.left ||
> +		old_state->tv.margins.right != new_state->tv.margins.right ||
> +		old_state->tv.margins.top != new_state->tv.margins.top ||
> +		old_state->tv.margins.bottom != new_state->tv.margins.bottom) {
This seems unwanted changes.
Thanks,
Anshuman.
>  		/* Force a modeset. */
>  
>  		new_crtc_state->connectors_changed = true;
> -- 
> 2.26.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx