lkml.org 
[lkml]   [2007]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH] drivers/bluetooth/hci_ldisc.c: fix possible NULL dereferences
    From
    Commit 22ad42033b7d2b3d7928fba9f89d1c7f8a3c9581 did not completely fix all 
    the possible NULL dereferences. Besides hci_uart_close(), we also need to
    make sure that hdev is valid before calling hci_{unregister,free}_dev().

    Signed-off-by: Eugene Teo <eugeneteo@kernel.sg>
    ---
    drivers/bluetooth/hci_ldisc.c | 7 +++----
    1 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
    index 6055b9c..4813f7c 100644
    --- a/drivers/bluetooth/hci_ldisc.c
    +++ b/drivers/bluetooth/hci_ldisc.c
    @@ -308,11 +308,10 @@ static void hci_uart_tty_close(struct tty_struct *tty)
    if (hu) {
    struct hci_dev *hdev = hu->hdev;

    - if (hdev)
    + if (hdev) {
    hci_uart_close(hdev);
    -
    - if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) {
    - hu->proto->close(hu);
    + if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags))
    + hu->proto->close(hu);
    hci_unregister_dev(hdev);
    hci_free_dev(hdev);
    }
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-07-29 16:51    [W:0.021 / U:0.240 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site