* [PATCH] net: ravb_main: fix a missing check of of_get_phy_mode
@ 2019-03-12 6:38 Kangjie Lu
2019-03-12 7:38 ` Sergei Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Kangjie Lu @ 2019-03-12 6:38 UTC (permalink / raw)
To: kjlu
Cc: pakki001, Sergei Shtylyov, David S. Miller, Vladimir Zapolskiy,
Simon Horman, Geert Uytterhoeven, Niklas Söderlund,
Andrew Lunn, Magnus Damm, Kazuya Mizuguchi, netdev,
linux-renesas-soc, linux-kernel
of_get_phy_mode may fail and return a negative error code;
the fix checks the return value of of_get_phy_mode and
goes to out_release if it fails.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
---
drivers/net/ethernet/renesas/ravb_main.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index d28c8f9ca55b..791b6842eb12 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1996,6 +1996,7 @@ static int ravb_probe(struct platform_device *pdev)
int error, irq, q;
struct resource *res;
int i;
+ int ret;
if (!np) {
dev_err(&pdev->dev,
@@ -2054,7 +2055,12 @@ static int ravb_probe(struct platform_device *pdev)
spin_lock_init(&priv->lock);
INIT_WORK(&priv->work, ravb_tx_timeout_work);
- priv->phy_interface = of_get_phy_mode(np);
+ ret = of_get_phy_mode(np);
+ if (ret < 0) {
+ error = -EINVAL;
+ goto out_release;
+ }
+ priv->phy_interface = ret;
priv->no_avb_link = of_property_read_bool(np, "renesas,no-ether-link");
priv->avb_link_active_low =
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: ravb_main: fix a missing check of of_get_phy_mode
2019-03-12 6:38 [PATCH] net: ravb_main: fix a missing check of of_get_phy_mode Kangjie Lu
@ 2019-03-12 7:38 ` Sergei Shtylyov
2019-03-12 7:42 ` Sergei Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Sergei Shtylyov @ 2019-03-12 7:38 UTC (permalink / raw)
To: Kangjie Lu
Cc: pakki001, David S. Miller, Vladimir Zapolskiy, Simon Horman,
Geert Uytterhoeven, Niklas Söderlund, Andrew Lunn,
Magnus Damm, Kazuya Mizuguchi, netdev, linux-renesas-soc,
linux-kernel
On 12.03.2019 9:38, Kangjie Lu wrote:
> of_get_phy_mode may fail and return a negative error code;
> the fix checks the return value of of_get_phy_mode and
> goes to out_release if it fails.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
> drivers/net/ethernet/renesas/ravb_main.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
> index d28c8f9ca55b..791b6842eb12 100644
> --- a/drivers/net/ethernet/renesas/ravb_main.c
> +++ b/drivers/net/ethernet/renesas/ravb_main.c
> @@ -1996,6 +1996,7 @@ static int ravb_probe(struct platform_device *pdev)
> int error, irq, q;
> struct resource *res;
> int i;
> + int ret;
There's the 'error' variable already for such things, use it.
>
> if (!np) {
> dev_err(&pdev->dev,
> @@ -2054,7 +2055,12 @@ static int ravb_probe(struct platform_device *pdev)
> spin_lock_init(&priv->lock);
> INIT_WORK(&priv->work, ravb_tx_timeout_work);
>
> - priv->phy_interface = of_get_phy_mode(np);
> + ret = of_get_phy_mode(np);
> + if (ret < 0) {
> + error = -EINVAL;
We typically propagate the errors upstream...
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: ravb_main: fix a missing check of of_get_phy_mode
2019-03-12 7:38 ` Sergei Shtylyov
@ 2019-03-12 7:42 ` Sergei Shtylyov
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2019-03-12 7:42 UTC (permalink / raw)
To: Kangjie Lu
Cc: pakki001, David S. Miller, Vladimir Zapolskiy, Simon Horman,
Geert Uytterhoeven, Niklas Söderlund, Andrew Lunn,
Magnus Damm, Kazuya Mizuguchi, netdev, linux-renesas-soc,
linux-kernel
On 12.03.2019 10:38, Sergei Shtylyov wrote:
>> of_get_phy_mode may fail and return a negative error code;
>> the fix checks the return value of of_get_phy_mode and
>> goes to out_release if it fails.
>>
>> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
>> ---
>> drivers/net/ethernet/renesas/ravb_main.c | 8 +++++++-
>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/renesas/ravb_main.c
>> b/drivers/net/ethernet/renesas/ravb_main.c
>> index d28c8f9ca55b..791b6842eb12 100644
>> --- a/drivers/net/ethernet/renesas/ravb_main.c
>> +++ b/drivers/net/ethernet/renesas/ravb_main.c
>> @@ -1996,6 +1996,7 @@ static int ravb_probe(struct platform_device *pdev)
>> int error, irq, q;
>> struct resource *res;
>> int i;
>> + int ret;
>
> There's the 'error' variable already for such things, use it.
Please ignore that. But the variable could be named 'interface' or
somesuch. :-)
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-03-12 7:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-12 6:38 [PATCH] net: ravb_main: fix a missing check of of_get_phy_mode Kangjie Lu
2019-03-12 7:38 ` Sergei Shtylyov
2019-03-12 7:42 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®