All of lore.kernel.org
 help / color / mirror / Atom feed
* [patch] hwmon: (pmbus/adm1275) fix memory leak on error
@ 2011-11-30  8:47 ` Dan Carpenter
  0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2011-11-30  8:47 UTC (permalink / raw)
  To: kernel-janitors

We added a bunch of new validation checks after an allocation without
adding the necessary calls to kfree().  Really they should have gone
before the allocation anyway.

I've shifted the allocation closer to the place where it is first
needed.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c
index 6349404..81c7c2e 100644
--- a/drivers/hwmon/pmbus/adm1275.c
+++ b/drivers/hwmon/pmbus/adm1275.c
@@ -192,10 +192,6 @@ static int adm1275_probe(struct i2c_client *client,
 				     | I2C_FUNC_SMBUS_BLOCK_DATA))
 		return -ENODEV;
 
-	data = kzalloc(sizeof(struct adm1275_data), GFP_KERNEL);
-	if (!data)
-		return -ENOMEM;
-
 	ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, block_buffer);
 	if (ret < 0) {
 		dev_err(&client->dev, "Failed to read Manufacturer ID\n");
@@ -226,16 +222,16 @@ static int adm1275_probe(struct i2c_client *client,
 			   id->name, mid->name);
 
 	config = i2c_smbus_read_byte_data(client, ADM1275_PMON_CONFIG);
-	if (config < 0) {
-		ret = config;
-		goto err_mem;
-	}
+	if (config < 0)
+		return config;
 
 	device_config = i2c_smbus_read_byte_data(client, ADM1275_DEVICE_CONFIG);
-	if (device_config < 0) {
-		ret = device_config;
-		goto err_mem;
-	}
+	if (device_config < 0)
+		return device_config;
+
+	data = kzalloc(sizeof(struct adm1275_data), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
 
 	data->id = mid->driver_data;
 

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [lm-sensors] [patch] hwmon: (pmbus/adm1275) fix memory leak on error
@ 2011-11-30  8:47 ` Dan Carpenter
  0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2011-11-30  8:47 UTC (permalink / raw)
  To: kernel-janitors

We added a bunch of new validation checks after an allocation without
adding the necessary calls to kfree().  Really they should have gone
before the allocation anyway.

I've shifted the allocation closer to the place where it is first
needed.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c
index 6349404..81c7c2e 100644
--- a/drivers/hwmon/pmbus/adm1275.c
+++ b/drivers/hwmon/pmbus/adm1275.c
@@ -192,10 +192,6 @@ static int adm1275_probe(struct i2c_client *client,
 				     | I2C_FUNC_SMBUS_BLOCK_DATA))
 		return -ENODEV;
 
-	data = kzalloc(sizeof(struct adm1275_data), GFP_KERNEL);
-	if (!data)
-		return -ENOMEM;
-
 	ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, block_buffer);
 	if (ret < 0) {
 		dev_err(&client->dev, "Failed to read Manufacturer ID\n");
@@ -226,16 +222,16 @@ static int adm1275_probe(struct i2c_client *client,
 			   id->name, mid->name);
 
 	config = i2c_smbus_read_byte_data(client, ADM1275_PMON_CONFIG);
-	if (config < 0) {
-		ret = config;
-		goto err_mem;
-	}
+	if (config < 0)
+		return config;
 
 	device_config = i2c_smbus_read_byte_data(client, ADM1275_DEVICE_CONFIG);
-	if (device_config < 0) {
-		ret = device_config;
-		goto err_mem;
-	}
+	if (device_config < 0)
+		return device_config;
+
+	data = kzalloc(sizeof(struct adm1275_data), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
 
 	data->id = mid->driver_data;
 

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [patch] hwmon: (pmbus/adm1275) fix memory leak on error
  2011-11-30  8:47 ` [lm-sensors] " Dan Carpenter
@ 2011-11-30 16:19   ` Guenter Roeck
  -1 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2011-11-30 16:19 UTC (permalink / raw)
  To: kernel-janitors

On Wed, 2011-11-30 at 03:47 -0500, Dan Carpenter wrote:
> We added a bunch of new validation checks after an allocation without
> adding the necessary calls to kfree().  Really they should have gone
> before the allocation anyway.
> 
> I've shifted the allocation closer to the place where it is first
> needed.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
Hi Dan,

thanks a lot for the fix. Since it applies to pending changes in -next,
I'll merge it with the original patch causing the problem (oops ;).

Thanks,
Guenter


> diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c
> index 6349404..81c7c2e 100644
> --- a/drivers/hwmon/pmbus/adm1275.c
> +++ b/drivers/hwmon/pmbus/adm1275.c
> @@ -192,10 +192,6 @@ static int adm1275_probe(struct i2c_client *client,
>  				     | I2C_FUNC_SMBUS_BLOCK_DATA))
>  		return -ENODEV;
>  
> -	data = kzalloc(sizeof(struct adm1275_data), GFP_KERNEL);
> -	if (!data)
> -		return -ENOMEM;
> -
>  	ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, block_buffer);
>  	if (ret < 0) {
>  		dev_err(&client->dev, "Failed to read Manufacturer ID\n");
> @@ -226,16 +222,16 @@ static int adm1275_probe(struct i2c_client *client,
>  			   id->name, mid->name);
>  
>  	config = i2c_smbus_read_byte_data(client, ADM1275_PMON_CONFIG);
> -	if (config < 0) {
> -		ret = config;
> -		goto err_mem;
> -	}
> +	if (config < 0)
> +		return config;
>  
>  	device_config = i2c_smbus_read_byte_data(client, ADM1275_DEVICE_CONFIG);
> -	if (device_config < 0) {
> -		ret = device_config;
> -		goto err_mem;
> -	}
> +	if (device_config < 0)
> +		return device_config;
> +
> +	data = kzalloc(sizeof(struct adm1275_data), GFP_KERNEL);
> +	if (!data)
> +		return -ENOMEM;
>  
>  	data->id = mid->driver_data;
>  



^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [lm-sensors] [patch] hwmon: (pmbus/adm1275) fix memory leak on
@ 2011-11-30 16:19   ` Guenter Roeck
  0 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2011-11-30 16:19 UTC (permalink / raw)
  To: kernel-janitors

On Wed, 2011-11-30 at 03:47 -0500, Dan Carpenter wrote:
> We added a bunch of new validation checks after an allocation without
> adding the necessary calls to kfree().  Really they should have gone
> before the allocation anyway.
> 
> I've shifted the allocation closer to the place where it is first
> needed.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
Hi Dan,

thanks a lot for the fix. Since it applies to pending changes in -next,
I'll merge it with the original patch causing the problem (oops ;).

Thanks,
Guenter


> diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c
> index 6349404..81c7c2e 100644
> --- a/drivers/hwmon/pmbus/adm1275.c
> +++ b/drivers/hwmon/pmbus/adm1275.c
> @@ -192,10 +192,6 @@ static int adm1275_probe(struct i2c_client *client,
>  				     | I2C_FUNC_SMBUS_BLOCK_DATA))
>  		return -ENODEV;
>  
> -	data = kzalloc(sizeof(struct adm1275_data), GFP_KERNEL);
> -	if (!data)
> -		return -ENOMEM;
> -
>  	ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, block_buffer);
>  	if (ret < 0) {
>  		dev_err(&client->dev, "Failed to read Manufacturer ID\n");
> @@ -226,16 +222,16 @@ static int adm1275_probe(struct i2c_client *client,
>  			   id->name, mid->name);
>  
>  	config = i2c_smbus_read_byte_data(client, ADM1275_PMON_CONFIG);
> -	if (config < 0) {
> -		ret = config;
> -		goto err_mem;
> -	}
> +	if (config < 0)
> +		return config;
>  
>  	device_config = i2c_smbus_read_byte_data(client, ADM1275_DEVICE_CONFIG);
> -	if (device_config < 0) {
> -		ret = device_config;
> -		goto err_mem;
> -	}
> +	if (device_config < 0)
> +		return device_config;
> +
> +	data = kzalloc(sizeof(struct adm1275_data), GFP_KERNEL);
> +	if (!data)
> +		return -ENOMEM;
>  
>  	data->id = mid->driver_data;
>  



_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-30 16:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-30  8:47 [patch] hwmon: (pmbus/adm1275) fix memory leak on error Dan Carpenter
2011-11-30  8:47 ` [lm-sensors] " Dan Carpenter
2011-11-30 16:19 ` Guenter Roeck
2011-11-30 16:19   ` [lm-sensors] [patch] hwmon: (pmbus/adm1275) fix memory leak on Guenter Roeck

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.