Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <ed931578-c79e-0161-24d5-ab9c302350e6@gmx.de>
Date:   Tue, 22 Feb 2022 09:01:02 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.0
Subject: Re: [PATCH] video: fbdev: via: check the return value of kstrdup()
Content-Language: en-US
To:     xkernel.wang@foxmail.com, FlorianSchandinat@gmx.de
Cc:     linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
References: <tencent_AD2E09472E455F78B792E6BF114813B35206@qq.com>
From:   Helge Deller <deller@gmx.de>
In-Reply-To: <tencent_AD2E09472E455F78B792E6BF114813B35206@qq.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On 2/21/22 11:37, xkernel.wang@foxmail.com wrote:
> From: Xiaoke Wang <xkernel.wang@foxmail.com>
>
> kstrdup() is a memory allocation function which can return NULL when
> some internal memory errors happen. It is better to check the return
> value of it to catch the error in time during the setup of viafb.
>
> Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>

applied to fbdev for-next tree.
Thanks!
Helge

> ---
>  drivers/video/fbdev/via/viafbdev.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/drivers/video/fbdev/via/viafbdev.c b/drivers/video/fbdev/vi=
a/viafbdev.c
> index 22deb34..2d67c92 100644
> --- a/drivers/video/fbdev/via/viafbdev.c
> +++ b/drivers/video/fbdev/via/viafbdev.c
> @@ -1939,8 +1939,12 @@ static int __init viafb_setup(void)
>
>  		if (!strncmp(this_opt, "viafb_mode1=3D", 12)) {
>  			viafb_mode1 =3D kstrdup(this_opt + 12, GFP_KERNEL);
> +			if (!viafb_mode1)
> +				return -ENOMEM;
>  		} else if (!strncmp(this_opt, "viafb_mode=3D", 11)) {
>  			viafb_mode =3D kstrdup(this_opt + 11, GFP_KERNEL);
> +			if (!viafb_mode)
> +				return -ENOMEM;
>  		} else if (!strncmp(this_opt, "viafb_bpp1=3D", 11)) {
>  			if (kstrtouint(this_opt + 11, 0, &viafb_bpp1) < 0)
>  				return -EINVAL;
> @@ -1969,6 +1973,8 @@ static int __init viafb_setup(void)
>  				return -EINVAL;
>  		} else if (!strncmp(this_opt, "viafb_active_dev=3D", 17)) {
>  			viafb_active_dev =3D kstrdup(this_opt + 17, GFP_KERNEL);
> +			if (!viafb_active_dev)
> +				return -ENOMEM;
>  		} else if (!strncmp(this_opt,
>  			"viafb_display_hardware_layout=3D", 30)) {
>  			if (kstrtoint(this_opt + 30, 0,
> @@ -1995,8 +2001,12 @@ static int __init viafb_setup(void)
>  				return -EINVAL;
>  		} else if (!strncmp(this_opt, "viafb_lcd_port=3D", 15)) {
>  			viafb_lcd_port =3D kstrdup(this_opt + 15, GFP_KERNEL);
> +			if (!viafb_lcd_port)
> +				return -ENOMEM;
>  		} else if (!strncmp(this_opt, "viafb_dvi_port=3D", 15)) {
>  			viafb_dvi_port =3D kstrdup(this_opt + 15, GFP_KERNEL);
> +			if (!viafb_dvi_port)
> +				return -ENOMEM;
>  		}
>  	}
>  	return 0;