Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 14 Jul 2021 18:52:24 +0200
Message-ID: <20210714185224.Horde.SuBZAzTXvfB6J6HsqQkOog6@messagerie.c-s.fr>
From:   Christophe Leroy <christophe.leroy@csgroup.eu>
To:     Yi Zhuang <zhuangyi1@huawei.com>
Cc:     linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
        hegdevasant@linux.vnet.ibm.com, paulus@samba.org,
        benh@kernel.crashing.org
Subject: Re: [PATCH v2] powerpc/rtas_flash: fix a potential buffer overflow
In-Reply-To: <20210714122753.76021-1-zhuangyi1@huawei.com>
User-Agent: Internet Messaging Program (IMP) H5 (6.2.3)
Content-Type: text/plain; charset=UTF-8; format=flowed; DelSp=Yes
MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: 8BIT
Precedence: bulk

Yi Zhuang <zhuangyi1@huawei.com> a écrit :

> Since snprintf() returns the possible output size instead of the
> actual output size, the available flash_msg length returned by
> get_validate_flash_msg may exceed the given buffer limit when
> simple_read_from_buffer calls copy_to_user
>
> Reported-by: kernel test robot <lkp@intel.com>
> Fixes: a94a14720eaf5 powerpc/rtas_flash: Fix validate_flash buffer  
> overflow issue
> Signed-off-by: Yi Zhuang <zhuangyi1@huawei.com>
> ---
>  arch/powerpc/kernel/rtas_flash.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/rtas_flash.c  
> b/arch/powerpc/kernel/rtas_flash.c
> index a99179d83538..062f0724c2ff 100644
> --- a/arch/powerpc/kernel/rtas_flash.c
> +++ b/arch/powerpc/kernel/rtas_flash.c
> @@ -470,9 +470,14 @@ static int get_validate_flash_msg(struct  
> rtas_validate_flash_t *args_buf,
>  	if (args_buf->status >= VALIDATE_TMP_UPDATE) {
>  		n = sprintf(msg, "%d\n", args_buf->update_results);
>  		if ((args_buf->update_results >= VALIDATE_CUR_UNKNOWN) ||
> -		    (args_buf->update_results == VALIDATE_TMP_UPDATE))
> +		    (args_buf->update_results == VALIDATE_TMP_UPDATE)) {
>  			n += snprintf(msg + n, msglen - n, "%s\n",
>  					args_buf->buf);
> +			if (n >= msglen) {

n cannot be greater than msglen


> +				n = msglen;
> +				printk(KERN_ERR "FLASH: msg too long.\n");
> +			}
> +		}
>  	} else {
>  		n = sprintf(msg, "%d\n", args_buf->status);
>  	}
> --
> 2.26.0.106.g9fadedd