Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Minjie Du <duminjie@vivo.com>
To:     Horatiu Vultur <horatiu.vultur@microchip.com>,
        UNGLinuxDriver@microchip.com (maintainer:MICROCHIP LAN966X ETHERNET
        DRIVER), "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Richard Cochran <richardcochran@gmail.com>,
        netdev@vger.kernel.org (open list:MICROCHIP LAN966X ETHERNET DRIVER),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, Minjie Du <duminjie@vivo.com>
Subject: [PATCH v1] net: lan966x: fix parameter check in two functions
Date:   Thu, 13 Jul 2023 16:59:08 +0800
Message-Id: <20230713085908.12113-1-duminjie@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?h7rRM9dO6Fd04w6g4zGYxtxIn9a8zP4gDl+tlXkZxvvO/tuH02tTKecuhaHk?=
 =?us-ascii?Q?iUQl586qBDux1eJqmvQ7ymS3rGta3CAxFHT+TtGGyU+9elfogXd0ktmt4jl7?=
 =?us-ascii?Q?dI7FYn/zt/49lfG8sn/pKUPcIvVhy+8GRsFK/wruogKaR5bXq4uXJNPOrKX/?=
 =?us-ascii?Q?sHpAS/0JLUmU2ZGZbPVnyx1OjSJyPColI10Qef+og5BZjEw672dk7JrkB2TW?=
 =?us-ascii?Q?vH82S53ApjnyYxpXuVuuwyYlFsYl58Enjp81YYlZAraamWT/jE4hmzEGJQ9Y?=
 =?us-ascii?Q?O4h5KLEGVrdbR+uD5OzOsPu8rcL2ZYq1f+0O1+QqoFA+Oxu9trWCoZuaH7MC?=
 =?us-ascii?Q?HmHZxYwkdvILp6kkyMC6s0g4IvOsg8nH6lS3PS3MAvBpDkPg011L3AKWF6wo?=
 =?us-ascii?Q?p1PYjAurEXoGnRnqEMMMyxstcbEM4xkRdff3TP+yedcqJfcE8bob9o7qMrac?=
 =?us-ascii?Q?/1fXAEmOkzjwCOuCGZDvOBoaRyCqwjhHz7hlpiZa3rrE9tbo1uOfFeIeXNcn?=
 =?us-ascii?Q?RaBMYlTDw/eggSi3VzDxOrrQXNjs8wbj8378OD5ecScOc7ckk7TQcJ/IdZ/L?=
 =?us-ascii?Q?yI2eitTZXCfnzn/QP2cxAX2CSanlRP3mDgy2vgYTdlGvHUCj8aA/KLuUSxOk?=
 =?us-ascii?Q?oAbzjISY3d+vyyrsH/xTqslc4LilrBO9OsljD4o48Be36tIjEt5oJ0hgH39H?=
 =?us-ascii?Q?Wt1YWRUJfm0OSc/QApNRb0FVdb6t0F086HE1oWFvGVrayHvgsLUTSWMRc+6U?=
 =?us-ascii?Q?y02PLLINMOrB0ys5zT9Yvu/BHH7HTXypw0vnLfBW/A2iIzJm8kwgj7gC3wWa?=
 =?us-ascii?Q?AWNucxHtNQhGHLEt5cZqTAF9zYpjRO+cLQNmvau0ZdEztBfBc80XRO6XPb3B?=
 =?us-ascii?Q?m+C5a+B3qNR02pB72NbA1TIQnjrBIlQ2oBjYLT5dH53xM3o7pRn7ZRMWRZaL?=
 =?us-ascii?Q?YRmliaKZo6QkdxfTY+hUiEjez96WZcxhyBytfRFjzMiSEw+HxtG5edUT295C?=
 =?us-ascii?Q?XrkulvL+2duegfnHTVQS1TageAQELoijJ1fR5JrWT0OS1bVAYzPRyfBghi20?=
 =?us-ascii?Q?T6cAWX9Y77iS6v2uh9pH+SGSnOyc1N+eZSdS2LhzYM7sJTw74gAvuZSZNY7I?=
 =?us-ascii?Q?IifxaC00dUaE0AQ/ppxeGRc1Mrz3zdinvpH8Z5h/dN0FrNS7ecBH2e9KTHV0?=
 =?us-ascii?Q?JbGu10UqN56ZyKbUiXO5FOeo+Y7jL5aRbr3v5DPZ+jiJnjdTdLQ/U8u34vlW?=
 =?us-ascii?Q?shQN5C5P3Ml9ZzXVVjo7OMpsqhLmH4bmhxPrepF1RbZ1X+pcny6dLOzBjoDJ?=
 =?us-ascii?Q?qklzlRzVUlTLWeVh1lzHU9aGDTIVf5pgWug2MDwVgPED0cQovZuWEc4yqMK4?=
 =?us-ascii?Q?H2OAkPbAWvhaqr1NuuHHoCxaXWcv4R9QzC+yNNo1NQPf2RK1KnkRKfqXiHzu?=
 =?us-ascii?Q?NAN2686m7/EZuBSee26Y3+NJ2LnxwZCpicX/Hsu7zDgzku2oPClH4S657JPX?=
 =?us-ascii?Q?rJ2INZPsCwQDtBJjtros0VjsWc1To8fQAVDkfS5PDassNrkRv1Gx87Gxbe7f?=
 =?us-ascii?Q?zRKIlBeAWn135Tkf6vxZomKqV9c2RglgI2MLiJoM?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 08143d98-ea92-4de0-880c-08db837f6fba
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB5288.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2023 08:59:16.3362
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: q9TmHBzpIdKhlgVN9TsfGjaIHPs9lRVezjI9hFp734CBK8mWCfo4VOja8NKM1491TTsUHlUPqW3NCSgGf497iw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR06MB6055
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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

Signed-off-by: Minjie Du <duminjie@vivo.com>
---
 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