Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acfd7af5 authored by Chris Manton's avatar Chris Manton
Browse files

Bluetooth: Properly initialize UART fds 

If the vendor library is unable to open the UART,
the passed in file descriptor array is unchanged.
This array was uninitialized stack memory which
may miss the illegal fd check and barrel ahead
forking a userial read thread causing FD_SET
problems should the uninitialized stack memory be
bogus fds outside the processes boundaries.
Verify that the vendor library was actually opening
exactly one uart.

Bug: 16651586

Change-Id: I24e700cdb0b0f3ed107f56b94b5b535abba66806
parent 8ea5347c

system/hci/src/userial.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -281,9 +281,12 @@ bool userial_open(userial_port_t port) { 




    // Call in to the vendor-specific library to open the serial port.

    // Call in to the vendor-specific library to open the serial port.

    int fd_array[CH_MAX];

    int fd_array[CH_MAX];

    for (int i = 0; i < CH_MAX; i++)

        fd_array[i] = -1;



    int num_ports = vendor_send_command(BT_VND_OP_USERIAL_OPEN, &fd_array);

    int num_ports = vendor_send_command(BT_VND_OP_USERIAL_OPEN, &fd_array);





    if (num_ports > 1) {

    if (num_ports != 1) {

        ALOGE("%s opened wrong number of ports: got %d, expected 1.", __func__, num_ports);

        ALOGE("%s opened wrong number of ports: got %d, expected 1.", __func__, num_ports);

        goto error;

        goto error;

    }

    }