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 net v3] net: lan966x: fix parameter check in two functions
Date:   Fri, 14 Jul 2023 16:51:15 +0800
Message-Id: <20230714085115.2379-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?/vX4WCB0OCllJ26P6rEpqIrKhitVfQsOM4M/oYu64shrsrH2qZsJWoo5w1W5?=
 =?us-ascii?Q?OQ9EvLHZ+9W568RbmP67kL7p2k5ovBgQY+/zWfTJPNPoB1jJSNuck3emXrfX?=
 =?us-ascii?Q?S/ovrJ879aRsgRFOIJe+VNK0MSdRDniAxwAlwf5IqYz1G4gkP8l+wdA7L/A0?=
 =?us-ascii?Q?ArQJmGftQlWhmzk9XEdPruIv94/SekSkhDAoYOLUOGZJlPWNT97k3mlCCHps?=
 =?us-ascii?Q?G6oSm0vX4Hp4dbKXua+XQrOp/mKk49SAH6nZcRR5usvfS3PFttqHyOcBqf5Y?=
 =?us-ascii?Q?rJJxYbws8gumsVDrN5CiUNOFEiV+6n/yK2Ljw7a922w5Yal3cIdedq38eT7h?=
 =?us-ascii?Q?6KgqFXlcm4GMs1Yn1kh0fiQdpjWi83t25zUCsYFOx8AC/0JlDrUhoiNIF2Rc?=
 =?us-ascii?Q?7JNZLWv818OxqpLdKsj14SEMzbcMoczSWR72vkfWTUFeYvD3yhxSNqx0n5hO?=
 =?us-ascii?Q?9dJoTcdyhdmOe1DBJjxy+QroKBWK96czqhdfJ5FN1OIxPfHXEK2cjn80tUAT?=
 =?us-ascii?Q?FBNvph2PfHzhVSRau+uNBK9SvXDovbz1faZI3XbBR5uPKYmzY9bis3bCK4N+?=
 =?us-ascii?Q?c/+vwez7zaLOoo1P4Cc8g/p1wivWlGfxi6P9UWuBrq3Df52PElFNSYOYR5ye?=
 =?us-ascii?Q?jjd2TGKRRr3NAAXI4MwEFPL5vyhhMbTarM7snLQAMCu6+ZAJ396W2eEQuJ4k?=
 =?us-ascii?Q?M6gtZ/2uvW3DMGBtvz+hqOdgmkWMv/yYRqbr1241W0kYc43FwYxlT+wdxXmi?=
 =?us-ascii?Q?lhZNp5ZxBPc8AIsEp0n0GH4FZ0BahjmQG14f4C98jz2mNZvMB/pLBUm1WYtG?=
 =?us-ascii?Q?EhhQ/gXT8Rj5l8wtROhkaPFMdMhANaSbCXuZXjDLbJSbQNj4oMHdLnyvVBLZ?=
 =?us-ascii?Q?wvb16VetUnHgKsjXcK+PSPZ6s3xxyx58bbKQYtaK1QlgignfBuv+H1LAKUEU?=
 =?us-ascii?Q?ToeErh/SvsLG95y1Rvoh+azkIpn4KXS+WOJz2ic9UeUvB1UOcgkp0pUn8r/K?=
 =?us-ascii?Q?aX8oAUegcfhNdJIm1lfi0Q/Aq3aPXE+f/UBfupIffu+15m6XB9mJI0l02soL?=
 =?us-ascii?Q?aPb/d/o4rnGY0NPltrZpgTtE/TMEbQWU2rqA6JtRMU/fCfk5hyWovCnPrK1J?=
 =?us-ascii?Q?yBQsb3ka0jD6i4L6tBBrq0wpNfH+dS8imxcFC8PH4ketHheDIVbTRd9DGNJx?=
 =?us-ascii?Q?XOuaTAL6jA8ZPShlifryHPAmE+l+7srb5lsbOKV1xeklmJ31otGRKFafTAql?=
 =?us-ascii?Q?Mb3E4P0sB38TZMqFYUJR+fZ6e1zl+PLHCiqS7MTsJTvCODt/nCtQMvbG5XJJ?=
 =?us-ascii?Q?FMo6sWJAcDcDvFcnRuoCPU2GAR5P1LkBxxR5Pe0CVlLAyw2iVTTgkWHHwgVq?=
 =?us-ascii?Q?ea9Gg3i5dYTMESqZhpcu8jBjmwiUjiqWBCE0BSwFKSASfkDa9nt9YOYv8p/3?=
 =?us-ascii?Q?BVp9Czm1bMWtVcCW/neb6Xgq4LoTkTVcEUNJ4LXJvy66M31EAFDijEEZeIUa?=
 =?us-ascii?Q?9AM/OMw9Dzbrkr3p6TAi/MPuctLyaTPu09A9iP7GwXRtyLbCZYMScQHSTYBh?=
 =?us-ascii?Q?9j4Ag2cTif/B82eJV25WLrCOuHLWAdAuA14QG2s0?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d4a367aa-b114-4d46-cfe0-08db844781f4
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB5288.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2023 08:51:26.2754
 (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: 6AieI4fprRBIyH8QQbvaJ92p033j3EL+zqjgeiEq9nDyaPxY5H50uX2ZO61yYXluX6/00B1/xOil1FILGa5CPA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4291
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_BLOCKED,
        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>
Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com>
---
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