ACK: [SRU][Trusty][PATCH 1/1] video: fbdev: aty: do not leak uninitialized padding in clk to userspace

Colin Ian King colin.king at canonical.com
Thu Dec 7 13:52:43 UTC 2017


On 07/12/17 13:50, Kleber Sacilotto de Souza wrote:
> From: Vladis Dronov <vdronov at redhat.com>
> 
> 'clk' is copied to a userland with padding byte(s) after 'vclk_post_div'
> field unitialized, leaking data from the stack. Fix this ensuring all of
> 'clk' is initialized to zero.
> 
> References: https://github.com/torvalds/linux/pull/441
> Reported-by: sohu0106 <sohu0106 at 126.com>
> Signed-off-by: Vladis Dronov <vdronov at redhat.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie at samsung.com>
> 
> CVE-2017-14156
> (backported from commit 8e75f7a7a00461ef6d91797a60b606367f6e344d)
> [klebers: adapted file path, which has been moved by f7018c213502 upstream]
> Signed-off-by: Kleber Sacilotto de Souza <kleber.souza at canonical.com>
> ---
>  drivers/video/aty/atyfb_base.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
> index 28fafbf864a5..fc17085ae1f7 100644
> --- a/drivers/video/aty/atyfb_base.c
> +++ b/drivers/video/aty/atyfb_base.c
> @@ -1852,7 +1852,7 @@ static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
>  #if defined(DEBUG) && defined(CONFIG_FB_ATY_CT)
>  	case ATYIO_CLKR:
>  		if (M64_HAS(INTEGRATED)) {
> -			struct atyclk clk;
> +			struct atyclk clk = { 0 };
>  			union aty_pll *pll = &par->pll;
>  			u32 dsp_config = pll->ct.dsp_config;
>  			u32 dsp_on_off = pll->ct.dsp_on_off;
> 

Looks OK to me.

Acked-by: Colin Ian King <colin.king at canonical.com>




More information about the kernel-team mailing list