lkml.org 
[lkml]   [2012]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 067/180] Bluetooth: add NULL pointer check in HCI
    2.6.32-longterm review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jun Nie <njun@marvell.com>

    commit d9319560b86839506c2011346b1f2e61438a3c73 upstream.

    If we fail to find a hci device pointer in hci_uart, don't try
    to deref the NULL one we do have.

    Signed-off-by: Jun Nie <njun@marvell.com>
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/bluetooth/hci_ldisc.c | 6 ++++--
    1 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
    index e3d4eda..e6f67b6 100644
    --- a/drivers/bluetooth/hci_ldisc.c
    +++ b/drivers/bluetooth/hci_ldisc.c
    @@ -313,8 +313,10 @@ static void hci_uart_tty_close(struct tty_struct *tty)

    if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) {
    hu->proto->close(hu);
    - hci_unregister_dev(hdev);
    - hci_free_dev(hdev);
    + if (hdev) {
    + hci_unregister_dev(hdev);
    + hci_free_dev(hdev);
    + }
    }
    }
    }
    --
    1.7.2.1.45.g54fbc




    \
     
     \ /
      Last update: 2012-10-02 02:41    [W:4.082 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site