Re: [PATCH] Bluetooth: Fix not checking for valid hdev on bt_dev_{info,warn,err,dbg}

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

 



Hi Luiz,

> 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@xxxxxxxxx>
> ---
> 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..d82736e58d45 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)
> +

use ((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__)

Regards

Marcel




[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