2023-07-14 01:58:51

by Minjie Du

Subject: [PATCH v2] net: lan966x: fix parameter check in two functions

Make IS_ERR_OR_NULL() judge the vcap_get_rule() function return.
in lan966x_ptp_add_trap() and lan966x_ptp_del_trap().

Fixes: 72df3489fb10 ("net: lan966x: Add ptp trap rules")
Signed-off-by: Minjie Du <[email protected]>
---
drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c b/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
index 266a21a2d..59dd14247 100644
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
@@ -59,7 +59,7 @@ static int lan966x_ptp_add_trap(struct lan966x_port *port,
int err;

vrule = vcap_get_rule(lan966x->vcap_ctrl, rule_id);
- if (vrule) {
+ if (!IS_ERR_OR_NULL(vrule)) {
u32 value, mask;

/* Just modify the ingress port mask and exit */
@@ -106,7 +106,7 @@ static int lan966x_ptp_del_trap(struct lan966x_port *port,
int err;

vrule = vcap_get_rule(lan966x->vcap_ctrl, rule_id);
- if (!vrule)
+ if (IS_ERR_OR_NULL(vrule))
return -EEXIST;

vcap_rule_get_key_u32(vrule, VCAP_KF_IF_IGR_PORT_MASK, &value, &mask);
--
2.39.0

2023-07-14 09:05:53

by Horatiu Vultur

Subject: Re: [PATCH v2] net: lan966x: fix parameter check in two functions

The 07/14/2023 09:22, Minjie Du wrote:

Hi Minjie,

>
> Make IS_ERR_OR_NULL() judge the vcap_get_rule() function return.
> in lan966x_ptp_add_trap() and lan966x_ptp_del_trap().
>
> Fixes: 72df3489fb10 ("net: lan966x: Add ptp trap rules")
> Signed-off-by: Minjie Du <[email protected]>

You forgot to set the target tree in the subject. You can do that when
you create the patch using the command:
git format-patch ... --subject-prefix "PATCH net" ...

Other than that, it looks OK:
Reviewed-by: Horatiu Vultur <[email protected]>

> ---
> drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c b/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
> index 266a21a2d..59dd14247 100644
> --- a/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
> +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
> @@ -59,7 +59,7 @@ static int lan966x_ptp_add_trap(struct lan966x_port *port,
> int err;
>
> vrule = vcap_get_rule(lan966x->vcap_ctrl, rule_id);
> - if (vrule) {
> + if (!IS_ERR_OR_NULL(vrule)) {
> u32 value, mask;
>
> /* Just modify the ingress port mask and exit */
> @@ -106,7 +106,7 @@ static int lan966x_ptp_del_trap(struct lan966x_port *port,
> int err;
>
> vrule = vcap_get_rule(lan966x->vcap_ctrl, rule_id);
> - if (!vrule)
> + if (IS_ERR_OR_NULL(vrule))
> return -EEXIST;
>
> vcap_rule_get_key_u32(vrule, VCAP_KF_IF_IGR_PORT_MASK, &value, &mask);
> --
> 2.39.0
>
>

--
/Horatiu