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;
Message-ID: <6a4cf06a-7646-c325-581c-7113202ee21a@suse.de>
Date:   Thu, 13 Jul 2023 16:41:32 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.12.0
Subject: Re: [PATCH v1] net: lan966x: fix parameter check in two functions
Content-Language: en-US
To:     Minjie Du <duminjie@vivo.com>,
        Horatiu Vultur <horatiu.vultur@microchip.com>,
        "maintainer:MICROCHIP LAN966X ETHERNET DRIVER" 
        <UNGLinuxDriver@microchip.com>,
        "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>,
        "open list:MICROCHIP LAN966X ETHERNET DRIVER" 
        <netdev@vger.kernel.org>, open list <linux-kernel@vger.kernel.org>
Cc:     opensource.kernel@vivo.com
References: <20230713085908.12113-1-duminjie@vivo.com>
From:   Denis Kirjanov <dkirjanov@suse.de>
In-Reply-To: <20230713085908.12113-1-duminjie@vivo.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 7/13/23 11:59, Minjie Du wrote:
> Make IS_ERR_OR_NULL() judge the vcap_get_rule() function return
> in lan966x_ptp_add_trap() and lan966x_ptp_del_trap().

Fixes: 72df3489fb103 ("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);