[PATCH] restart: fix restart handler by name selection

[Ahmad Fatoum]

On 7/2/26 3:51 PM, Marco Felsch wrote:
> On 26-07-02, Ahmad Fatoum wrote:
>> Hello,
>>
>> On 6/22/26 7:21 PM, Marco Felsch wrote:
>>> Commit d20a9a455d8d ("restart: allow selecting restart handler by device
>>> name") introduce a bug, while adding the support to select a restart
>>> handler by device name.
>>>
>>> The list_for_each_entry() loop should sort out all restart handler which
>>> don't match the user requested restart handler. Instead all restart
>>> handlers which don't have a device associated are honored as well
>>> because the if condition is always 0 in this case.
>>>
>>> Split the if to fix this and add a helper variable to make the code more
>>> readable.
>>>
>>> Fixes: d20a9a455d8d ("restart: allow selecting restart handler by device name")
>>> Signed-off-by: Marco Felsch <m.felsch at pengutronix.de>
>>
>> Why do we have restart handlers without a device name?
> 
> Because it's not required for them to have a device associated, e.g.
> each restart_handler_register_fn() user doesn't have a device set.

Ah, thanks for fixing.

Cheers,
Ahmad

> 
> Regards,
>   Marco
> 
>>
>> Cheers,
>> Ahmad
>>
>>> ---
>>>  common/restart.c | 9 +++++++--
>>>  1 file changed, 7 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/common/restart.c b/common/restart.c
>>> index 391d7bd3773c..85519912170d 100644
>>> --- a/common/restart.c
>>> +++ b/common/restart.c
>>> @@ -117,8 +117,13 @@ struct restart_handler *restart_handler_get_by_name(const char *name, int flags)
>>>  
>>>  	list_for_each_entry(tmp, &restart_handler_list, list) {
>>>  		if (name) {
>>> -			if ((tmp->name && strcmp(name, tmp->name)) &&
>>> -			    (tmp->dev && strcmp(name, dev_name(tmp->dev))))
>>> +			bool found = false;
>>> +
>>> +			if (tmp->name && !strcmp(name, tmp->name))
>>> +				found = true;
>>> +			if (tmp->dev && !strcmp(name, dev_name(tmp->dev)))
>>> +				found = true;
>>> +			if (!found)
>>>  				continue;
>>>  		}
>>>  
>>
>> -- 
>> Pengutronix e.K.                  |                             |
>> Steuerwalder Str. 21              | http://www.pengutronix.de/  |
>> 31137 Hildesheim, Germany         | Phone: +49-5121-206917-0    |
>> Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |
>>
>>
> 

-- 
Pengutronix e.K.                  |                             |
Steuerwalder Str. 21              | http://www.pengutronix.de/  |
31137 Hildesheim, Germany         | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |