Re: [PATCH RFC 0/6] ALSA: Fix UAF with delayed kobj release

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Aug 15, 2023 at 10:35 PM Takashi Iwai <tiwai@xxxxxxx> wrote:
>
> On Tue, 15 Aug 2023 23:32:31 +0200,
> Curtis Malainey wrote:
> >
> > On Tue, Aug 15, 2023 at 9:07 AM Takashi Iwai <tiwai@xxxxxxx> wrote:
> > >
> > > On Mon, 14 Aug 2023 22:20:29 +0200,
> > > Curtis Malainey wrote:
> > > >
> > > > On Sun, Aug 13, 2023 at 1:08 AM Takashi Iwai <tiwai@xxxxxxx> wrote:
> > > > >
> > > > >
> > > > >
> > > > > So, if we tie the object resource with each struct device release, we
> > > > > have a lot of works:
> > > > > 1. Add extra dependencies among device hierarchy
> > > > > 2. Don't use card_dev refcount for managing the sync to device closes,
> > > > >    introduce another kref instead; otherwise card_dev refcount would
> > > > >    never reach to zero
> > > > > 3. Fix race of devres vs card_dev release
> > > > > 4. Move the second half part of snd_card_do_free() to the release
> > > > >    callback of card_dev itself to sync with the top-level release
> > > > > 5. Rewrite all SNDRV_DEV_LOWLEVEL usages to be called via
> > > > >    card->private_free or such;
> > > > >    maybe the only problem is hda_intel.c and hda_tegra.c that need
> > > > >    some work at the disconnection time, and we may introduce another
> > > > >    hook in the card object to replace that
> > > > >
> > > > > And, at this moment, I feel that it'd be easier to go back to the
> > > > > early way of device management, i.e. it'll be just like your patch,
> > > > > managing the device object independently from the rest resources.
> > > > > (This means also that the way freeing the resource for hwdep and
> > > > >  rawmidi will go back again without the embedded device, too; they
> > > > >  also suffer from the same problem of .)
> > > >
> > > > I agree, I think as a simple stopgap, my earlier patch would at least
> > > > appease the test until we can figure out the best way to do some
> > > > heavier work on the kobj. I think the proxy pointer for devres would
> > > > also be the best short term for 3.
> > > >
> > > > >
> > > > > The change 2 and 3 above can be still applied with your change, which
> > > > > will fix the remaining devres-vs-card_dev problem.
> > > >
> > > > I am not sure I follow the need for 2. If we broke ctl_dev out into
> > > > its own memory region and structured everything as a proper tree we
> > > > would have a proper cleanup and be able to use the refcounting
> > > > properly.
> > >
> > > My thought was about the devres release that does kfree() of the card
> > > while the card's card_dev release itself is still delayed.
> > > This might be a needless fear, though, as snd_card_free() should sync
> > > with the actual card_dev release.
> > >
> > > But, splitting the release-trigger and the actual memory release could
> > > be still worth.
> > >
> > > > > Once after fixing the current problem, we may work further on other
> > > > > stuff (e.g. item 5), so that we can switch again to the device-release
> > > > > model eventually later, too.
> > > >
> > > > Agreed, I don't have any experience with SNDRV_DEV_LOWLEVEL but I am
> > > > happy to help out here where I can.
> > > >
> > > > I am going to see if I can split the release card as mentioned but
> > > > also have refcount work as expected and have the release calls roll up
> > > > the tree.
> > >
> > > I quickly worked on and made a patch series.
> > > It's put in topic/dev-split branch of sound git tree
> > >   https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/log/?h=topic/dev-split
> > >
> > > It'd be appreciated if you can review / test it.
> >
> > Took a look and ran it through the tests
> >
> > You need to apply this diff
>
> Thanks, I'll fix it up.
>
> >
> > diff --git a/sound/usb/media.c b/sound/usb/media.c
> > index 6d11fedb46326..d48db6f3ae659 100644
> > --- a/sound/usb/media.c
> > +++ b/sound/usb/media.c
> > @@ -35,7 +35,7 @@ int snd_media_stream_init(struct snd_usb_substream
> > *subs, struct snd_pcm *pcm,
> >  {
> >         struct media_device *mdev;
> >         struct media_ctl *mctl;
> > -       struct device *pcm_dev = &pcm->streams[stream].dev;
> > +       struct device *pcm_dev = pcm->streams[stream].dev;
> >         u32 intf_type;
> >         int ret = 0;
> >         u16 mixer_pad;
> >
> > Hammering probe and remove appears to be fine. Went 45min without issue.
> >
> > Userspace holding references past hw removal appears to still be
> > broken as sound is released while the app is still running.
> >
> > -- remove usb device --
> > [ 4819.827476] kobject: 'controlC1' (00000000255a51c8):
> > fill_kobj_path: path =
> > '/devices/pci0000:00/0000:00:14.0/usb3/3-9/3-9:1.0/sound/card1/controlC1'
> > [ 4819.828114] kobject: 'pcmC1D0p' (00000000f0627532): kobject_uevent_env
> > [ 4819.828145] kobject: 'pcmC1D0p' (00000000f0627532): fill_kobj_path:
> > path = '/devices/pci0000:00/0000:00:14.0/usb3/3-9/3-9:1.0/sound/card1/pcmC1D0p'
> > [ 4819.828822] kobject: 'pcmC1D0c' (000000001b707a15): kobject_uevent_env
> > [ 4819.828850] kobject: 'pcmC1D0c' (000000001b707a15): fill_kobj_path:
> > path = '/devices/pci0000:00/0000:00:14.0/usb3/3-9/3-9:1.0/sound/card1/pcmC1D0c'
> > [ 4819.829405] kobject: 'card1' (000000005bce975e): kobject_uevent_env
> > [ 4819.829428] kobject: 'card1' (000000005bce975e): fill_kobj_path:
> > path = '/devices/pci0000:00/0000:00:14.0/usb3/3-9/3-9:1.0/sound/card1'
> > [ 4819.829516] kobject: 'sound' (000000000bb52434): kobject_release,
> > parent 0000000000000000 (delayed 4000)
> > [ 4823.873625] kobject: 'sound' (000000000bb52434): kobject_cleanup,
> > parent 0000000000000000
> > [ 4823.873645] kobject: 'sound' (000000000bb52434): calling ktype release
> > [ 4823.873654] kobject: 'sound': free name
> >
> > -- end app --
> > [ 4849.581815] kobject: 'pcmC1D0p' (00000000f0627532):
> > kobject_release, parent 0000000000000000 (delayed 2000)
> > [ 4849.581960] kobject: 'pcmC1D0c' (000000001b707a15):
> > kobject_release, parent 0000000000000000 (delayed 2000)
> > [ 4849.582626] kobject: 'card1' (000000005bce975e): kobject_release,
> > parent 0000000000000000 (delayed 1000)
> > [ 4850.625615] kobject: 'card1' (000000005bce975e): kobject_cleanup,
> > parent 0000000000000000
> > [ 4850.625638] kobject: 'card1' (000000005bce975e): calling ktype release
> > [ 4850.625663] kobject: 'card1': free name
> > [ 4851.585647] kobject: 'pcmC1D0c' (000000001b707a15):
> > kobject_cleanup, parent 0000000000000000
> > [ 4851.585672] kobject: 'pcmC1D0c' (000000001b707a15): calling ktype release
> > [ 4851.585708] kobject: 'pcmC1D0c': free name
> > [ 4851.585727] kobject: 'pcmC1D0p' (00000000f0627532):
> > kobject_cleanup, parent 0000000000000000
> > [ 4851.585737] kobject: 'pcmC1D0p' (00000000f0627532): calling ktype release
> > [ 4851.585752] kobject: 'pcmC1D0p': free name
>
> It's the designed behavior.  Those are device *files* that are deleted
> immediately at the disconnection while the application is still
> running.  It's for avoiding a new application to be started after the
> disconnect.  That is, only the device files in /dev/snd/* become
> invisible.  Meanwhile, the already opened objects are still handled
> internally.

It seems incorrect from a refcounting perspective though. The device
still has active children so we need to remove the entry but should
not be triggering the release yet.

Based on the docs for kobject this is exactly how kobject_del behaves
(remove from sysfs without dropping refcount) so it looks like we just
need to fix the refcounting part.

>
> > I still don't understand why you need the kref. The devices are
> > already reference counting, why not use them? If we split them up into
> > their own structs we could then just device_put everything on removal
> > and let it roll up the tree with releases automatically, blocking
> > where userspace is still holding references. I will share a patches
> > sometime this week of what I mean. They will probably be a bit bigger
> > blast radius but I think its what is needed here.
>
> We want to trigger the top-level release free procedure once when all
> files are closed.  This top-level release does put_device() of all
> belonging devices.

Is there a need for this synchronization?

>
> The card_dev device refcount was used for this purpose.  OTOH, if we
> want to construct the topology of the devices until the actual
> deletion (i.e. keep card_dev until pcm and others are really
> released/deleted), the card_dev refcount will be used for managing
> the topology, too.  So, it'll get a side-effect side-effect that the
> card_dev refcount won't be zero even after all files are closed (it's
> referred from the children).

I think this is the intended use case for this system and would make
it much easier to free the code. This will even allow early partial
removal of the card until user space lets go of whatever parts it's
holding onto (e.g. PCM is still open but controls have cleaned up if
there is no dependency on controls). It would allow for a lot of
synchronization code to be removed and just let the card handle
itself.

>
> So, it's a kind of preparation for the future.
>
>
> Takashi




[Index of Archives]     [ALSA User]     [Linux Audio Users]     [Pulse Audio]     [Kernel Archive]     [Asterisk PBX]     [Photo Sharing]     [Linux Sound]     [Video 4 Linux]     [Gimp]     [Yosemite News]

  Powered by Linux