[Bug 59321] [hsw] S4 broken with Haswell

[bugzilla-daemon at bugzilla.kernel.org]

https://bugzilla.kernel.org/show_bug.cgi?id=59321

--- Comment #49 from Imre Deak <imre.deak at intel.com> ---
(In reply to Imre Deak from comment #48)
> diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
> index 610b720..eb867fa 100644
> --- a/drivers/tty/vt/consolemap.c
> +++ b/drivers/tty/vt/consolemap.c
> @@ -539,6 +539,9 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct
> unipair __user *list)
>  
>  	/* Save original vc_unipagdir_loc in case we allocate a new one */
>  	p = *vc->vc_uni_pagedir_loc;
> +
> +	if (!p)
> +		return -EINVAL;
>  	
>  	if (p->refcount > 1) {
>  		int j, k;

Oops, wrong patch, the correct one:

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index 610b720..59b25e0 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -539,6 +539,12 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct
unipair __user *list)

     /* Save original vc_unipagdir_loc in case we allocate a new one */
     p = *vc->vc_uni_pagedir_loc;
+
+    if (!p) {
+        err = -EINVAL;
+
+        goto out_unlock;
+    }

     if (p->refcount > 1) {
         int j, k;
@@ -623,6 +629,7 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct
unipair __user *list)
         set_inverse_transl(vc, p, i); /* Update inverse translations */
     set_inverse_trans_unicode(vc, p);

+out_unlock:
     console_unlock();
     return err;
 }

-- 
You are receiving this mail because:
You are on the CC list for the bug.
You are the assignee for the bug.