2017-07-08 08:40:21

by Christophe JAILLET

Subject: [PATCH v2] mrf24j40: Fix en error handling path in 'mrf24j40_probe()'

If this check fails, we must release some resources as done everywhere
else in this function before returning an error code.

Signed-off-by: Christophe JAILLET <[email protected]>
---
V2: initialization of ret in this erro path ws missing. Stupid me!
---
drivers/net/ieee802154/mrf24j40.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 7d334963dc08..da8683782ffc 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -1330,7 +1330,8 @@ static int mrf24j40_probe(struct spi_device *spi)
if (spi->max_speed_hz > MAX_SPI_SPEED_HZ) {
dev_warn(&spi->dev, "spi clock above possible maximum: %d",
MAX_SPI_SPEED_HZ);
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_register_device;
}

ret = mrf24j40_hw_init(devrec);
--
2.11.0

2017-07-10 19:24:22

by Alan Ott

Subject: Re: [PATCH v2] mrf24j40: Fix en error handling path in 'mrf24j40_probe()'

On 07/08/2017 04:40 AM, Christophe JAILLET wrote:
> If this check fails, we must release some resources as done everywhere
> else in this function before returning an error code.
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> V2: initialization of ret in this erro path ws missing. Stupid me!
> ---
> drivers/net/ieee802154/mrf24j40.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
> index 7d334963dc08..da8683782ffc 100644
> --- a/drivers/net/ieee802154/mrf24j40.c
> +++ b/drivers/net/ieee802154/mrf24j40.c
> @@ -1330,7 +1330,8 @@ static int mrf24j40_probe(struct spi_device *spi)
> if (spi->max_speed_hz > MAX_SPI_SPEED_HZ) {
> dev_warn(&spi->dev, "spi clock above possible maximum: %d",
> MAX_SPI_SPEED_HZ);
> - return -EINVAL;
> + ret = -EINVAL;
> + goto err_register_device;
> }
>
> ret = mrf24j40_hw_init(devrec);
>

Acked-by: Alan Ott <[email protected]>

2017-07-11 06:48:38

by Marcel Holtmann

Subject: Re: [PATCH v2] mrf24j40: Fix en error handling path in 'mrf24j40_probe()'

Hi Christophe,

> If this check fails, we must release some resources as done everywhere
> else in this function before returning an error code.
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> V2: initialization of ret in this erro path ws missing. Stupid me!
> ---
> drivers/net/ieee802154/mrf24j40.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel