[LEDE-DEV] [PATCH] ar71xx: Fix NULL pointer dereferece in at803x_link_change_notify()

John Crispin john at phrozen.org
Sat Oct 7 14:12:19 PDT 2017


Hi Andrey,

merged Thanks !

next time please add [PATCH V2] and a short explanation what of what the 
difference between v1 and v2 is below the tear-line

     John

On 07/10/17 23:00, Andrey Jr. Melnikov wrote:
> Check pdata pointer before use to avoid OOPS if dev_get_platdata() return
> NULL.
>
> Signed-off-by: "Andrey Jr. Melnikov" <temnota.am at gmail.com>
>
> ---
>
> diff --git a/target/linux/ar71xx/patches-4.4/902-at803x-add-reset-gpio-pdata.patch b/target/linux/ar71xx/patches-4.4/902-at803x-add-reset-gpio-pdata.patch
> index 2244f882e7..efc8502bcd 100644
> --- a/target/linux/ar71xx/patches-4.4/902-at803x-add-reset-gpio-pdata.patch
> +++ b/target/linux/ar71xx/patches-4.4/902-at803x-add-reset-gpio-pdata.patch
> @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
>    	 */
>    	if (phydev->state == PHY_NOLINK) {
>   -		if (priv->gpiod_reset && !priv->phy_reset) {
> -+		if ((priv->gpiod_reset || pdata->has_reset_gpio) &&
> ++		if ((priv->gpiod_reset || (pdata && pdata->has_reset_gpio)) &&
>   +		    !priv->phy_reset) {
>    			struct at803x_context context;
>    
> @@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
>   -			msleep(1);
>   -			gpiod_set_value(priv->gpiod_reset, 0);
>   -			msleep(1);
> -+			if (pdata->has_reset_gpio) {
> ++			if (pdata && pdata->has_reset_gpio) {
>   +				gpio_set_value_cansleep(pdata->reset_gpio, 0);
>   +				msleep(1);
>   +				gpio_set_value_cansleep(pdata->reset_gpio, 1);
>
> _______________________________________________
> Lede-dev mailing list
> Lede-dev at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev




More information about the Lede-dev mailing list