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:     dkirjanov@suse.de, 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 v2] net: lan966x: fix parameter check in two functions
Date:   Fri, 14 Jul 2023 09:22:19 +0800
Message-Id: <20230714012220.891-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?po30seB0PmFDzjq0onr1kJ6F91A9IpgXLH0Rz9iSEIIyG1UCrswmI0BLj8+8?=
 =?us-ascii?Q?UOuIWcWyM66rkrBfND/NLb1xW0TKWFYVTRIdSelTH76xKfbMKe4/fnwP8vmv?=
 =?us-ascii?Q?Yft7Yjh5gu6ZZl/uqccVPXWAcIZemHEqB9GJKthBQTbA/ZnfTalQrYTNhac0?=
 =?us-ascii?Q?QHjbvaAg3B04WCqX35iswXdhd59wAG1YExKqabI0HNZy5SzuEdiqNP2NcVPj?=
 =?us-ascii?Q?60LmiaoiWI8HsUncLFs6Ja6UIN70kqFnz32Rvok9V+x5ujMdwMgcYyDmRDgP?=
 =?us-ascii?Q?5A9Ym5Y17SsYYX/OJsNAEny9cZQTW3KS7GA2t/6kjq+BI0lnNgseLCiWYoBZ?=
 =?us-ascii?Q?kfpqmmE7pJdyWHKbb7JGorT3UvOQwiSJLszMj7j98GgG1ekn7/z1jigzNoX8?=
 =?us-ascii?Q?msTuovffLm1ShA9mu1KaVXX+yh95KGXoW0/TNPhjNTYJ1mSu9jg7eqjtmMj/?=
 =?us-ascii?Q?vBP+sWcoXAoauB3Z43Z6qvCm7z7TJsk16vQZETciunMDFpxNySrfGrYAXNFu?=
 =?us-ascii?Q?tG7Jb6gwGomGbtFguaBTzA3pH6vGNeOvA9kGsFAXutFZLRU4DAFR2QNJQez/?=
 =?us-ascii?Q?tObKHP/dDVA15rjoqAJKDJjZTKzFuFyjR0T4ksw3mxnMSTqdehHNgYiLB77S?=
 =?us-ascii?Q?xVcl3+g2CA5pdzwM+94xFAUgxaxgRw6XFNGgLVf3JdyJbVc3afqUnA0wESiR?=
 =?us-ascii?Q?+H+FBuiIdrdhcfGymZcmmnX93BsMq5VErEQU6pe4PY8ghajAIHzDC4bvi9/E?=
 =?us-ascii?Q?xb61dQ+3ske0MrTu4zR4BBYuhXhz2Fch7jO1Xa/dGSf6FpEeTzQ2KSV7D74t?=
 =?us-ascii?Q?G/x1VO++gMkB1fRinQmlQOdt9mu4++9dWkiVoPVikVYPBGvA82o1rYnuUVFd?=
 =?us-ascii?Q?kVYU/q0xpN3b9G4CP4x0u2QT1oki1xqxBi/bzeb0tkE4LtM6mydB9q0i/X0M?=
 =?us-ascii?Q?hI0PXWo29bA/XEu/1Wt0y0e5SefXOTsusKg5QyXOvd+rlwwhlEs9gLo8TZVd?=
 =?us-ascii?Q?SnLzhC0z/47yDD9Rt0yg3w7kuMMzEqQckAKMph60s4PHsu47N13rjDNiqwvS?=
 =?us-ascii?Q?tS8lWsw+HlXQVwtNJX6t5UrthsOpjQyeNI4KEZFWFIPGsgYSPeuS1IUuqJNE?=
 =?us-ascii?Q?Dl722bMyP4KtO9at0bg4KBeKHOfCW32OJkPNRzw0zjUwUyIzMdosJEA5jcvY?=
 =?us-ascii?Q?ERXP7evbpgZ1Zp3h8mYgCQgf1f4WecmNzgS82vRiTC7UOTWgabEAh7m2ZNRA?=
 =?us-ascii?Q?1qcCJvkfMQ4pts/HMs1q8PnBcS1ZdDUv6vW76wQhx39CfOEYXlkJh/wgSkCF?=
 =?us-ascii?Q?OI66y6X/Z9XHM+EFHW8qG3JFsgGJaRRn4rZjdY0jFjDdsBmOgfZBkl8+P7JD?=
 =?us-ascii?Q?aBmt9MK1Bodtb90H4OGwS/pnj+F4p0hvvwXgYXN9sXHz3mGZKZ0P8ZBcCkJD?=
 =?us-ascii?Q?VY+UystBzLAsl+v73SguEmtOae7jR03zAau2ywPacdbRR9eWj3y8EhWuYJf2?=
 =?us-ascii?Q?/gEhLMbROANHLS9ewssQNKy9WgjdBDWR7x0ElnAxO5xpoB0+GpIO7EfJTfaA?=
 =?us-ascii?Q?4/XYxtIWZEHQBNLba2bZgBDPVoXWWiHdrwuPTWzh?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cb75d3a4-0e69-409a-f53a-08db8408d9b7
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB5288.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2023 01:22:55.2042
 (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: sfUnAVoeYmffKgqzvidy5X084cpOTstLjJHZ0oNDyu7VlUGOVyV7L3WLW4Zcn6c02FNeheoh4o2SYSxaWz6Nxg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR06MB6655
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,
        URIBL_BLOCKED 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().

Fixes: 72df3489fb10 ("net: lan966x: Add ptp trap rules")
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