On Sun, Sep 13, 2015 at 11:33:51AM +0530, Sudip Mukherjee wrote:
> commit 9e326f78713a4421fe11afc2ddeac07698fac131 upstream
>
> We can call this function for a dummy console that doesn't support
> setting the font mapping, which will result in a null ptr BUG. So check
> for this case and return error for consoles w/o font mapping support.
>
> Cc: <stable@xxxxxxxxxxxxxxx> # 3.14.x
> Signed-off-by: Sudip Mukherjee <sudip@xxxxxxxxxxxxxxx>
> ---
>
> backporting for the first time so not exactly sure if the format is ok.
You need to keep the original authorship of the patch around, as well as
their signed-off-by information. Also, you didn't backport it
identically:
>
> drivers/tty/vt/consolemap.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
> index 2978ca5..08d36e4 100644
> --- a/drivers/tty/vt/consolemap.c
> +++ b/drivers/tty/vt/consolemap.c
> @@ -540,6 +540,11 @@ 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 = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
> +
> + if (!p) {
> + err = -EINVAL;
> + goto out_unlock;
The original has a blank line between these two lines, why not keep it?
I'll fix it up, but be a bit more careful next time please.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html