mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 08:33:17 +02:00
Merge branch 'xa_alloc_cyclic-checks'
Michal Swiatkowski says: ==================== fix xa_alloc_cyclic() return checks Pierre Riteau <pierre@stackhpc.com> found suspicious handling an error from xa_alloc_cyclic() in scheduler code [1]. The same is done in few other places. v1 --> v2: [2] * add fixes tags * fix also the same usage in dpll and phy [1] https://lore.kernel.org/netdev/20250213223610.320278-1-pierre@stackhpc.com/ [2] https://lore.kernel.org/netdev/20250214132453.4108-1-michal.swiatkowski@linux.intel.com/ ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
d9c743b699
|
|
@ -505,7 +505,7 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module,
|
|||
xa_init_flags(&pin->parent_refs, XA_FLAGS_ALLOC);
|
||||
ret = xa_alloc_cyclic(&dpll_pin_xa, &pin->id, pin, xa_limit_32b,
|
||||
&dpll_pin_xa_id, GFP_KERNEL);
|
||||
if (ret)
|
||||
if (ret < 0)
|
||||
goto err_xa_alloc;
|
||||
return pin;
|
||||
err_xa_alloc:
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ int phy_link_topo_add_phy(struct net_device *dev,
|
|||
xa_limit_32b, &topo->next_phy_index,
|
||||
GFP_KERNEL);
|
||||
|
||||
if (ret)
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ static struct devlink_rel *devlink_rel_alloc(void)
|
|||
|
||||
err = xa_alloc_cyclic(&devlink_rels, &rel->index, rel,
|
||||
xa_limit_32b, &next, GFP_KERNEL);
|
||||
if (err) {
|
||||
if (err < 0) {
|
||||
kfree(rel);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user