Re: [PATCH] hwmon: (w83627ehf) fix broken driver init

[Jean Delvare]

On Sat, 5 Nov 2011 07:43:43 -0700, Guenter Roeck wrote:
> Commit 2265cef2 (hwmon: (w83627ehf) Properly report PECI and AMD-SI
> sensor types) results in kernel panic if data->temp_label was not
> initialized.
> The problem was found with chip W83627DHG-P.
> 
> Add check if data->temp->label was set before use.
> 
> Based on incomplete patch by Alexander Beregalov.
> 
> Reported-by: Alexander Beregalov <a.beregalov@xxxxxxxxx>
> Tested-by: Alexander Beregalov <a.beregalov@xxxxxxxxx>
> Cc: Jean Delvare <khali@xxxxxxxxxxxx>
> Cc: stable@xxxxxxxxxx
> Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
> ---
>  drivers/hwmon/w83627ehf.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
> index 483cb26..93f5fc7 100644
> --- a/drivers/hwmon/w83627ehf.c
> +++ b/drivers/hwmon/w83627ehf.c
> @@ -1835,12 +1835,15 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
>  		diode = 0x70;
>  	}
>  	for (i = 0; i < 3; i++) {
> -		const char *label = data->temp_label[data->temp_src[i]];
> +		const char *label = NULL;
> +
> +		if (data->temp_label)
> +			label = data->temp_label[data->temp_src[i]];
>  
>  		/* Digital source overrides analog type */
> -		if (strncmp(label, "PECI", 4) == 0)
> +		if (label && strncmp(label, "PECI", 4) == 0)
>  			data->temp_type[i] = 6;
> -		else if (strncmp(label, "AMD", 3) == 0)
> +		else if (label && strncmp(label, "AMD", 3) == 0)
>  			data->temp_type[i] = 5;
>  		else if ((tmp & (0x02 << i)))
>  			data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;

Applied, thanks.

-- 
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/