lkml.org 
[lkml]   [2022]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 123/343] Bluetooth: Fix not checking for valid hdev on bt_dev_{info,warn,err,dbg}
    Date
    From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

    [ Upstream commit 9b392e0e0b6d026da5a62bb79a08f32e27af858e ]

    This fixes attemting to print hdev->name directly which causes them to
    print an error:

    kernel: read_version:367: (efault): sock 000000006a3008f2

    Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/net/bluetooth/bluetooth.h | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
    index a647e5fabdbd..2aa5e95808a5 100644
    --- a/include/net/bluetooth/bluetooth.h
    +++ b/include/net/bluetooth/bluetooth.h
    @@ -204,19 +204,21 @@ void bt_err_ratelimited(const char *fmt, ...);
    #define BT_DBG(fmt, ...) pr_debug(fmt "\n", ##__VA_ARGS__)
    #endif

    +#define bt_dev_name(hdev) ((hdev) ? (hdev)->name : "null")
    +
    #define bt_dev_info(hdev, fmt, ...) \
    - BT_INFO("%s: " fmt, (hdev)->name, ##__VA_ARGS__)
    + BT_INFO("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)
    #define bt_dev_warn(hdev, fmt, ...) \
    - BT_WARN("%s: " fmt, (hdev)->name, ##__VA_ARGS__)
    + BT_WARN("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)
    #define bt_dev_err(hdev, fmt, ...) \
    - BT_ERR("%s: " fmt, (hdev)->name, ##__VA_ARGS__)
    + BT_ERR("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)
    #define bt_dev_dbg(hdev, fmt, ...) \
    - BT_DBG("%s: " fmt, (hdev)->name, ##__VA_ARGS__)
    + BT_DBG("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)

    #define bt_dev_warn_ratelimited(hdev, fmt, ...) \
    - bt_warn_ratelimited("%s: " fmt, (hdev)->name, ##__VA_ARGS__)
    + bt_warn_ratelimited("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)
    #define bt_dev_err_ratelimited(hdev, fmt, ...) \
    - bt_err_ratelimited("%s: " fmt, (hdev)->name, ##__VA_ARGS__)
    + bt_err_ratelimited("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)

    /* Connection and socket states */
    enum {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-04-12 11:09    [W:3.815 / U:1.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site