]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ice: Fix some null pointer dereference issues in ice_ptp.c
authorKunwu Chan <chentao@kylinos.cn>
Tue, 12 Dec 2023 02:40:15 +0000 (10:40 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 23:44:56 +0000 (15:44 -0800)
[ Upstream commit 3027e7b15b02d2d37e3f82d6b8404f6d37e3b8cf ]

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@hotmail.com>
Suggested-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/intel/ice/ice_ptp.c

index 71f405f8a6fee67663feb4b5ea805dfb75239c9a..e6b1ce76ca8a62c5469228738ae8c1d9c20cf734 100644 (file)
@@ -2692,6 +2692,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;
@@ -2938,6 +2940,8 @@ 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)
+               return -ENOMEM;
 
        aux_dev->name = name;
        aux_dev->id = id;