]> www.infradead.org Git - users/jedix/linux-maple.git/commit
comedi: comedi_test: Fix possible deletion of uninitialized timers
authorIan Abbott <abbotti@mev.co.uk>
Tue, 8 Jul 2025 13:06:27 +0000 (14:06 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Jul 2025 13:02:44 +0000 (15:02 +0200)
commit1b98304c09a0192598d0767f1eb8c83d7e793091
treef111a61bfb29198f4ec2345b72f5ef3e06354486
parent46d8c744136ce2454aa4c35c138cc06817f92b8e
comedi: comedi_test: Fix possible deletion of uninitialized timers

In `waveform_common_attach()`, the two timers `&devpriv->ai_timer` and
`&devpriv->ao_timer` are initialized after the allocation of the device
private data by `comedi_alloc_devpriv()` and the subdevices by
`comedi_alloc_subdevices()`.  The function may return with an error
between those function calls.  In that case, `waveform_detach()` will be
called by the Comedi core to clean up.  The check that
`waveform_detach()` uses to decide whether to delete the timers is
incorrect.  It only checks that the device private data was allocated,
but that does not guarantee that the timers were initialized.  It also
needs to check that the subdevices were allocated.  Fix it.

Fixes: 73e0e4dfed4c ("staging: comedi: comedi_test: fix timer lock-up")
Cc: stable@vger.kernel.org # 6.15+
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20250708130627.21743-1-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/comedi/drivers/comedi_test.c