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;
Date:   Wed, 7 Jun 2023 13:46:41 +0200
From:   Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To:     Sai Krishna <saikrishnag@marvell.com>
CC:     <davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
        <pabeni@redhat.com>, <netdev@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <sgoutham@marvell.com>,
        <dan.carpenter@linaro.org>,
        Naveen Mamindlapalli <naveenm@marvell.com>
Subject: Re: [net PATCH] octeontx2-af: Fix pointer dereference before sanity
 check
Message-ID: <ZIBuIXH2M1KbCg06@boxer>
References: <20230607070255.2013980-1-saikrishnag@marvell.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230607070255.2013980-1-saikrishnag@marvell.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wrGWjmT+A/zZoEbiv6JnusSCx6xyky5AADLV41me1Klp4zs/RuCNcBKn2d+z?=
 =?us-ascii?Q?YbuJll+DB8Dm5lgPSlRIl38dKNyq6J83y+pG3/7lQTk9A5WBZpGf6q3nEVMr?=
 =?us-ascii?Q?8CFcSnIU1gzJ4TU/tiGe7If80vnKMLT+KIem4fKdyUuuuoZwSLR/OIVRNwEO?=
 =?us-ascii?Q?77ENPExBW+b8Oz7x8qCVrOAYQM78PfsyTs9vPAkooTyE+rZoodnuzsTLIDQ6?=
 =?us-ascii?Q?NZoyRmF82YzXUbMFQ7D2p5eLFkb8kw/Mts2UxgCJxFsS/RHVKFS7ucm0HHEo?=
 =?us-ascii?Q?1+W/Ts8CheTczwzA7fuT7dv7TlCFIt5uwe5T2Skr5CXYxoJ3g/cy7GuZ32sw?=
 =?us-ascii?Q?X58fk887r3faLpwwF/q7beOFAieP1fssMFltuVLfLSGA1hGwqyHafbpx5VQQ?=
 =?us-ascii?Q?OcLgjqyM754kaKpz0YtHQwJwQYHKRDASAxbclPggSIKNeije8m+WqMZ4u5ET?=
 =?us-ascii?Q?JQ6Nwp20HPu48ShNdiv4Mhb6Fq+6DnJK7xLZBfTdSIOyp+cftF2tK6TjmIxR?=
 =?us-ascii?Q?hyUyyC6TQGeFVoXMdx18aDXEjbMr5zjsivvHiARgBevETmQafM8PFw2vV9Ap?=
 =?us-ascii?Q?UleU+GJ+WhAvNKyj65N6xOjsgLaB1X19gNonIKYx6RwGcMkJpru+OBbS560W?=
 =?us-ascii?Q?HW6hgN0pybGprEukhu3gBCyPt49CrNavEQgE9n6z1yVBQLWG1F/+f1lijVc8?=
 =?us-ascii?Q?PohnjejKUge3OSA0fNtvZd8HbAz9dtrz2JKu2SSWqpCzE1TnEtlxVO52urhv?=
 =?us-ascii?Q?DIsoLUnkVILJz6XiUUDyIxkAozznVlV8AOBIc/r17ylUWzhlN1+469C3hJnB?=
 =?us-ascii?Q?7m4umvU8zVQuj5rqFCJiaoOkY8h3dgfhO19Er6iocFnAU5A9sd3NCc1glZG7?=
 =?us-ascii?Q?Y1MrF8pZp0fuX6QYticVx6OqbAGD0z2cFk75/WbZqvbTvsuhyZCqSlsePrVi?=
 =?us-ascii?Q?dJby3RSsQUJIf1J8qwXGAJ7ILm8MEOkkhQdtQ4MUYJyBs//ulreJdRfTUjFY?=
 =?us-ascii?Q?oa3HPo1KKY1V9HTiiB5JbnhmxOuqXZeS5fInT4W5p/fNunBfwjFKfv4gxMbK?=
 =?us-ascii?Q?8XPLvgQKUPNfV5L7KyVkyatkCQY6GZn4HRpvOLG74DCjETn8DSwjbIo1JBq1?=
 =?us-ascii?Q?IsxouDjsTXmsdcuzUheOhGWs+/IdjTKI5VQOViHtym7WIuKTt6OTi+Yk/lRv?=
 =?us-ascii?Q?nAND/IKFMkzVf6k1Zvzi0IxsWBmrAJ4ma8ukchZRX915QUF+c62OkSbkVI3p?=
 =?us-ascii?Q?DMcs0bnzVKlrT8gplW0KubY0YIw9dRaCGCP3nCbQgENA5g5+XEnLItVbnVs3?=
 =?us-ascii?Q?csPZq68T7DWV0/z13PKSBzmkiAb/FNRk01Py0jaDKFWAOsPWiEPi7hjysgLT?=
 =?us-ascii?Q?r3w9+pG8xg/4hLw3oSVYuq6pn1lThOqP505wDJf4r/mySmklkM1Q8/rTF9h9?=
 =?us-ascii?Q?6OO6jkF4EY+hR3yFvEMNXkpcapGchwvcr+gDeupeBlrDhDrK06NGvUI4DANY?=
 =?us-ascii?Q?lLwvEoybYQ7UgyIB+bYdZQIhHDlyTue/83A33Ajd+jNYcJ/wgSkZcYBq9vbN?=
 =?us-ascii?Q?IpkfLE6upB0W5N4ww5Di2imeHbVO8PB5AVZfLyP6e9Z0XHEDJEL1+5SMFnCH?=
 =?us-ascii?Q?DUEw5yNwV2mMlvtjj4GQNQs=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 46bb870e-f686-47a3-2c15-08db674ce370
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6117.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2023 11:46:53.5415
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lhqzAJPUzpaD4f/RrERceS6VfxS8InPu5hyffPQpQ1wZ8ED2phxIeXlZqmbWE2c/POdMwalX/FFxX0iggp6CVApVi9lrccYbWFXcKNJsYz8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB6870
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,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

On Wed, Jun 07, 2023 at 12:32:55PM +0530, Sai Krishna wrote:
> PTP pointer is being dereferenced before NULL, error check.
> Fixed the same to avoid NULL dereference and smatch checker warning.

please use imperative mood, you could say:
Move validation of ptp pointer before its usage

> 
> Fixes: 2ef4e45d99b1 ("octeontx2-af: Add PTP PPS Errata workaround on CN10K silicon")
> Signed-off-by: Sai Krishna <saikrishnag@marvell.com>
> Signed-off-by: Naveen Mamindlapalli <naveenm@marvell.com>

Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>

> ---
>  drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/ptp.c b/drivers/net/ethernet/marvell/octeontx2/af/ptp.c
> index 3411e2e47d46..6a7dfb181fa8 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/ptp.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/ptp.c
> @@ -449,12 +449,12 @@ static void ptp_remove(struct pci_dev *pdev)
>  	struct ptp *ptp = pci_get_drvdata(pdev);
>  	u64 clock_cfg;
>  
> -	if (cn10k_ptp_errata(ptp) && hrtimer_active(&ptp->hrtimer))
> -		hrtimer_cancel(&ptp->hrtimer);
> -
>  	if (IS_ERR_OR_NULL(ptp))
>  		return;
>  
> +	if (cn10k_ptp_errata(ptp) && hrtimer_active(&ptp->hrtimer))
> +		hrtimer_cancel(&ptp->hrtimer);
> +
>  	/* Disable PTP clock */
>  	clock_cfg = readq(ptp->reg_base + PTP_CLOCK_CFG);
>  	clock_cfg &= ~PTP_CLOCK_CFG_PTP_EN;

i wonder if ptp_remove() would be able to free the struct ptp that
ptp_probe() allocated - then you wouldn't have to use devm_kzalloc().

> -- 
> 2.25.1
> 
>