Re: [PATCH BlueZ 1/2] audio/AVCTP: Fix crash after disconnecting

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

 



Hi Johan,

On Fri, Oct 11, 2013 at 2:58 PM, Johan Hedberg <johan.hedberg@xxxxxxxxx> wrote:
> Hi Luiz,
>
> On Fri, Oct 11, 2013, Luiz Augusto von Dentz wrote:
>>   at 0x414C08: finalize_discovery (avdtp.c:1050)
>>   by 0x414C5A: process_discover (avdtp.c:3346)
>>   by 0x3D46047E05: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.3600.3)
>>   by 0x3D46048157: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
>>   by 0x3D46048559: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.3600.3)
>>   by 0x40A3B6: main (main.c:595)
>> Address 0x5e25de8 is 1,144 bytes inside a block of size 1,176 free'd
>> at 0x4A074C4: free (in
>> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
>>   by 0x3D4604D9AE: g_free (in /usr/lib64/libglib-2.0.so.0.3600.3)
>>   by 0x4152F2: connection_lost (avdtp.c:1206)
>>   by 0x4162C4: cancel_request (avdtp.c:2662)
>>   by 0x4164BD: request_timeout (avdtp.c:2672)
>>   by 0x3D46048962: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
>>   by 0x3D46047E05: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.3600.3)
>>   by 0x3D46048157: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
>>   by 0x3D46048559: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.3600.3)
>>   by 0x40A3B6: main (main.c:595)
>> ---
>>  profiles/audio/avdtp.c | 42 +++++++++++++++++++++++++-----------------
>>  1 file changed, 25 insertions(+), 17 deletions(-)
>>
>> diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
>> index 622dff8..b938ee7 100644
>> --- a/profiles/audio/avdtp.c
>> +++ b/profiles/audio/avdtp.c
>> @@ -354,6 +354,12 @@ struct avdtp_state_callback {
>>       void *user_data;
>>  };
>>
>> +struct discover_callback {
>> +     unsigned int id;
>> +     avdtp_discover_cb_t cb;
>> +     void *user_data;
>> +};
>> +
>>  struct avdtp_stream {
>>       GIOChannel *io;
>>       uint16_t imtu;
>> @@ -412,9 +418,7 @@ struct avdtp {
>>
>>       char *buf;
>>
>> -     avdtp_discover_cb_t discov_cb;
>> -     void *user_data;
>> -
>> +     struct discover_callback *discover;
>>       struct pending_req *req;
>
> It seems to me that this patch is doing two things:
>
> 1. Refactor the discov data out to a separate struct
> 2. Add an idle callback id for some extra tracking
>
> Shouldn't these be done in separate patches? Furthermore, I had to read
> through the patch several times to figure out exactly what the fix is -
> something I wouldn't have needed to do if there was a proper commit
> message explaining what was wrong and how you fix it.

Yep, it seems there is also a typo it should have been AVDTP not
AVCTP, anyway gonna split the patch one with a fix to cancel if
g_idle_add is pending when disconnected and a second to push the
discover data to a specific struct.


-- 
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux