[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <447d130a-e1ac-02f6-e168-b04bfa9c6004@intel.com>
Date: Mon, 11 Dec 2023 08:15:53 +0100
From: Przemek Kitszel <przemyslaw.kitszel@...el.com>
To: Kunwu Chan <chentao@...inos.cn>, <jesse.brandeburg@...el.com>,
<anthony.l.nguyen@...el.com>, <davem@...emloft.net>,
<edumazet@...gle.com>, <kuba@...nel.org>, <pabeni@...hat.com>,
<richardcochran@...il.com>, <jacob.e.keller@...el.com>,
<karol.kolacinski@...el.com>
CC: <michal.michalik@...el.com>, <intel-wired-lan@...ts.osuosl.org>,
<netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
Kunwu Chan <kunwu.chan@...mail.com>
Subject: Re: [PATCH] ice: Fix some null pointer dereference issues in
ice_ptp.c
On 12/11/23 07:26, Kunwu Chan wrote:
> devm_kasprintf() returns a pointer to dynamically allocated memory
> which can be NULL upon failure.
>
> Fixes: d938a8cca88a ("ice: Auxbus devices & driver for E822 TS")
> Cc: Kunwu Chan <kunwu.chan@...mail.com>
> Signed-off-by: Kunwu Chan <chentao@...inos.cn>
I would suggest adding "iwl-net" as a target here
> ---
> drivers/net/ethernet/intel/ice/ice_ptp.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
> index 1eddcbe89b0c..59794ce4f243 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
> @@ -2668,6 +2668,8 @@ static int ice_ptp_register_auxbus_driver(struct ice_pf *pf)
> name = devm_kasprintf(dev, GFP_KERNEL, "ptp_aux_dev_%u_%u_clk%u",
> pf->pdev->bus->number, PCI_SLOT(pf->pdev->devfn),
> ice_get_ptp_src_clock_index(&pf->hw));
> + if (!name)
> + return -ENOMEM;
>
> aux_driver->name = name;
> aux_driver->shutdown = ice_ptp_auxbus_shutdown;
> @@ -2929,6 +2931,10 @@ static int ice_ptp_create_auxbus_device(struct ice_pf *pf)
> name = devm_kasprintf(dev, GFP_KERNEL, "ptp_aux_dev_%u_%u_clk%u",
> pf->pdev->bus->number, PCI_SLOT(pf->pdev->devfn),
> ice_get_ptp_src_clock_index(&pf->hw));
> + if (!name) {
> + dev_err(dev, "Failed to allocate memory\n");
Kuba @ [1]:
no warnings on allocation failures, there will be a splat for GFP_KERNEL
(checkpatch should catch this)
[1] https://lore.kernel.org/netdev/20231206195304.6226771d@kernel.org/T/
so just "return -ENOMEM" would be sufficient
> + return -ENOMEM;
> + }
>
> aux_dev->name = name;
> aux_dev->id = id;
I didn't checked but having same code in two places raises questions.
Are you overwriting old name here, or our code is just self similar?
Powered by blists - more mailing lists