* [PATCH net v4] net: lan966x: fix parameter check in two functions
@ 2023-07-17 2:22 Minjie Du
2023-07-19 0:52 ` Jakub Kicinski
0 siblings, 1 reply; 2+ messages in thread
From: Minjie Du @ 2023-07-17 2:22 UTC (permalink / raw)
To: Horatiu Vultur, maintainer:MICROCHIP LAN966X ETHERNET DRIVER,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Richard Cochran, open list:MICROCHIP LAN966X ETHERNET DRIVER,
open list
Cc: opensource.kernel, Minjie Du, Simon Horman
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 <duminjie@vivo.com>
Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
---
V2 -> V3: add 'Reviewed-by: Simon Horman' tag.
V2 -> V3: set the target tree in the subject and add 'Reviewed-by:' tag.
V1 -> V2: add Fixes tag.
V1: fix parameter check in two functions.
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net v4] net: lan966x: fix parameter check in two functions
2023-07-17 2:22 [PATCH net v4] net: lan966x: fix parameter check in two functions Minjie Du
@ 2023-07-19 0:52 ` Jakub Kicinski
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Kicinski @ 2023-07-19 0:52 UTC (permalink / raw)
To: Minjie Du
Cc: Horatiu Vultur, maintainer:MICROCHIP LAN966X ETHERNET DRIVER,
David S. Miller, Eric Dumazet, Paolo Abeni, Richard Cochran,
open list:MICROCHIP LAN966X ETHERNET DRIVER, open list,
opensource.kernel, Simon Horman
On Mon, 17 Jul 2023 10:22:35 +0800 Minjie Du wrote:
> vrule = vcap_get_rule(lan966x->vcap_ctrl, rule_id);
> - if (vrule) {
> + if (!IS_ERR_OR_NULL(vrule)) {
Please make vcap_get_rule() return an error pointer rather than NULL.
Mixing the two is a common source of errors.
--
pw-bot: cr
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-07-19 0:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-17 2:22 [PATCH net v4] net: lan966x: fix parameter check in two functions Minjie Du
2023-07-19 0:52 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).