Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210611020728.15233-1-jprvita@endlessos.org>
In-Reply-To: <20210611020728.15233-1-jprvita@endlessos.org>
From:   =?UTF-8?Q?Jo=C3=A3o_Paulo_Rechi_Vita?= <jprvita@gmail.com>
Date:   Tue, 29 Jun 2021 16:46:12 -0700
Message-ID: <CA+A7VXVO6cyVCRnEHvPC1jW_+rQ582AA6c9n68xiGg5t0NwnHQ@mail.gmail.com>
Subject: Re: [PATCH BlueZ] profile: Fail RegisterProfile if UUID already exists
To:     linux-bluetooth@vger.kernel.org
Cc:     =?UTF-8?Q?Jo=C3=A3o_Paulo_Rechi_Vita?= <jprvita@endlessos.org>,
        linux@endlessos.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Thu, Jun 10, 2021 at 7:07 PM Jo=C3=A3o Paulo Rechi Vita <jprvita@gmail.c=
om> wrote:
>
> From: Jo=C3=A3o Paulo Rechi Vita <jprvita@gmail.com>
>
> If a process tries to register a profile implementation that is already
> registered, RegisterProfile should fail.
>
> This should help address issues when two instances of PulseAudio are
> running at the same time, and the second instance tries to register an
> audio profile implementation that has already been registered by the
> first instance. Two situations where this may happen is when more than
> one user is logged in, or during the transition between the GDM session
> and the user session, when PulseAudio gets started on the new session
> before the old session has been fully terminated.
>
> https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/303
> https://gitlab.gnome.org/GNOME/gdm/-/issues/486

Any feedback on these changes?  I have
https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/593
on the PulseAudio side, and we have been shipping these changes on
Endless OS to address the case where PulseAudio gets started on the
user session before PulseAudio on the GDM session has finished.

Thanks,

Jo=C3=A3o Paulo.

> ---
>  src/profile.c | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
>
> diff --git a/src/profile.c b/src/profile.c
> index 5e460b639..60d17b6ae 100644
> --- a/src/profile.c
> +++ b/src/profile.c
> @@ -749,6 +749,30 @@ void btd_profile_foreach(void (*func)(struct btd_pro=
file *p, void *data),
>         }
>  }
>
> +static struct btd_profile *btd_profile_find_uuid(const char *uuid)
> +{
> +       GSList *l, *next;
> +
> +       for (l =3D profiles; l !=3D NULL; l =3D next) {
> +               struct btd_profile *p =3D l->data;
> +
> +               if (!g_strcmp0(p->local_uuid, uuid))
> +                       return p;
> +               next =3D g_slist_next(l);
> +       }
> +
> +       for (l =3D ext_profiles; l !=3D NULL; l =3D next) {
> +               struct ext_profile *ext =3D l->data;
> +               struct btd_profile *p =3D &ext->p;
> +
> +               if (!g_strcmp0(p->local_uuid, uuid))
> +                       return p;
> +               next =3D g_slist_next(l);
> +       }
> +
> +       return NULL;
> +}
> +
>  int btd_profile_register(struct btd_profile *profile)
>  {
>         profiles =3D g_slist_append(profiles, profile);
> @@ -2441,6 +2465,12 @@ static DBusMessage *register_profile(DBusConnectio=
n *conn,
>         dbus_message_iter_get_basic(&args, &uuid);
>         dbus_message_iter_next(&args);
>
> +       if (btd_profile_find_uuid(uuid)) {
> +               warn("%s tried to register %s which is already registered=
",
> +                                                               sender, u=
uid);
> +               return btd_error_not_permitted(msg, "UUID already registe=
red");
> +       }
> +
>         if (dbus_message_iter_get_arg_type(&args) !=3D DBUS_TYPE_ARRAY)
>                 return btd_error_invalid_args(msg);
>
> --
> 2.20.1
>