Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp5591682pxb; Mon, 28 Mar 2022 14:40:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLszIfrVrI7r9BnIQVheOoLuZg/5LmMLev0/1z4BfrF9AKL8tOLYstySACsmVLty8z0GSX X-Received: by 2002:a1f:5242:0:b0:33f:e060:f261 with SMTP id g63-20020a1f5242000000b0033fe060f261mr12164878vkb.16.1648503620942; Mon, 28 Mar 2022 14:40:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648503620; cv=none; d=google.com; s=arc-20160816; b=ubQySGNcdpQdgTtneMn84md0j9HDxquc4y15gTUjFCzURisPw5foC7FzP+AElrPp0k 1gKCIO7BxbDTnmp0CBGUtjKAQU+krWryALLLkH8AEJgJf+dOBI2hhXRrxeZxa7t902h+ 5u4tkdX4cSfxDNQjbZVXq6TqYVIotB+DHGWuCVpyRuznkaf2EqkvPgH1N5unaEWPwOhC uOcXhv73tzKRWzUND+dn/yu97oOrL7ZrAdAUVWUE/WrghN7NRKUyOFK1mVPalEVp04AE GHxuo87L7XOQOHAS2CsYXTeTNV8OS0we9abK44Q287vlaiABnkYJC4QiwZxmSbeb2P0T ykrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:to:from:dkim-signature; bh=35kxULv19kXP0F0eIjo2W7cgQqxbhNtPu7FF26C/RjE=; b=iE48vTEWYGgWLfPko0ZnziH3Dqg2uWBEIkOH90e3VzFtqUeUTkefiF2V5OEPArWl4a vmv8TcOjvshIrG7tBIpzP519oJrs+e3y/w4iXoXK1WoOllPh50GZ5CdGbEjCJpLlsr7T M6VbyQWjn8XMz07pq9XVdX7XYFL257+WNO9i1LvcjYLZbtyte3CBoj/cgg3ZOeTNaCs4 csoP/dXP1D4cWWO7B6OSvPDPmj/jF+sm342KC2/PlN4q2TDISL7D1zZ5RhUPJIHt7dmn E5KKNbTzn/E0YKjVCjFLoy4QGhQwSEdKXUJBCS8FIuqaAI8KiKvyHsnGpERflo/x3s7r bL/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=McWGK0Uc; spf=softfail (google.com: domain of transitioning linux-bluetooth-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id x23-20020a67c097000000b00324c5c3beb0si3070618vsi.242.2022.03.28.14.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 14:40:20 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-bluetooth-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=McWGK0Uc; spf=softfail (google.com: domain of transitioning linux-bluetooth-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 08CE8986EA; Mon, 28 Mar 2022 14:17:11 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245363AbiC1S7q (ORCPT + 99 others); Mon, 28 Mar 2022 14:59:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245367AbiC1S7q (ORCPT ); Mon, 28 Mar 2022 14:59:46 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBD46644F9 for ; Mon, 28 Mar 2022 11:58:04 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: fdanis) with ESMTPSA id 9655A1F402B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1648493882; bh=Bp7gnDs7Mr84pc91rAFBicot0w9W370QZLBKw4bpWIg=; h=From:To:Subject:Date:From; b=McWGK0UcbAAk2VC94UzYIGow2SHASRw/dJhTmctpBHNlQ3ttb6E6qipccRvT6+DpQ qXFD0abrW/UxZinLsinx6bChhztmNyPGytYvVt+3L2pm8Dx3t8dp6kZV9stDA+brmL Mcczrki/2NocGoxO7SZaSbhroBIUyazPLULf0w4iWqxJsDpXkgUdTBO2IZag2ODNjR 51Bh3ZjVp7w5FqVVktCIgLyOYDe2qHGqX84rqQk3p8PQ9PufIhRMvJtatLgvFAyUly v7lnreArxjhAkDoDUUMeop8yu8Tfqeo0qhMaPJCOg3xu7S0akt5rPW44zisbh2DWbD XOZAqZBVNKndg== From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= To: linux-bluetooth@vger.kernel.org Subject: [PATCH v2] a2dp: Fix crash when SEP codec has not been initialized Date: Mon, 28 Mar 2022 20:57:53 +0200 Message-Id: <20220328185753.161203-1-frederic.danis@collabora.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org If SEP has not been properly discovered avdtp_get_codec may return NULL thus causing crashes such as when running AVRCP/TG/VLH/BI-01-C after AVRCP/TG/RCR/BV-04-C. The endpoint should not be registered if its codec is not available. --- v2: don't register enpoint if its codec is unavailable profiles/audio/a2dp.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c index f761dbe54..8c20f22f0 100644 --- a/profiles/audio/a2dp.c +++ b/profiles/audio/a2dp.c @@ -1995,7 +1995,12 @@ static gboolean get_codec(const GDBusPropertyTable *property, { struct a2dp_remote_sep *sep = data; struct avdtp_service_capability *cap = avdtp_get_codec(sep->sep); - struct avdtp_media_codec_capability *codec = (void *) cap->data; + struct avdtp_media_codec_capability *codec; + + if (!cap) + return FALSE; + + codec = (void *) cap->data; dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, &codec->media_codec_type); @@ -2008,10 +2013,16 @@ static gboolean get_capabilities(const GDBusPropertyTable *property, { struct a2dp_remote_sep *sep = data; struct avdtp_service_capability *service = avdtp_get_codec(sep->sep); - struct avdtp_media_codec_capability *codec = (void *) service->data; - uint8_t *caps = codec->data; + struct avdtp_media_codec_capability *codec; + uint8_t *caps; DBusMessageIter array; + if (!service) + return FALSE; + + codec = (void *) service->data; + caps = codec->data; + dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE_AS_STRING, &array); @@ -2076,6 +2087,11 @@ static struct a2dp_remote_sep *register_remote_sep(void *data, void *user_data) if (sep) return sep; + if (!avdtp_get_codec(rsep)) { + error("Unable to get remote sep codec"); + return NULL; + } + sep = new0(struct a2dp_remote_sep, 1); sep->chan = chan; sep->sep = rsep; -- 2.25.1