ASoC: Fix double free and memory leak in many codec drivers
Subsystems (4)
PATCH 1/1 ASoC: Fix double free and memory leak in many codec drivers
From: Jean Delvare <[email protected]>
Many SoC audio codec drivers have improper freeing of memory in error paths.
* codec is allocated in the platform device probe function, but is not freed there in case of error. Instead it is freed in the i2c device probe function's error path. However the success or failure of both functions is not linked, so this could result in a double free (if the platform device is successfully probed, the i2c device probing fails and then the platform driver is unregistered.)
* codec->private_data is allocated in many platform device probe functions but not freed in their error paths.
This patch hopefully solves all these problems.
--- sound/soc/codecs/ak4535.c | 11 +++++++---- sound/soc/codecs/tlv320aic3x.c | 11 +++++++---- sound/soc/codecs/uda1380.c | 9 +++++---- sound/soc/codecs/wm8510.c | 9 +++++---- sound/soc/codecs/wm8731.c | 11 +++++++---- sound/soc/codecs/wm8750.c | 10 ++++++---- sound/soc/codecs/wm8753.c | 11 +++++++---- sound/soc/codecs/wm8990.c | 11 +++++++---- 8 files changed, 51 insertions(+), 32 deletions(-)
sound/soc/codecs/ak4535.c +7 -4
@@ -562,10 +562,9 @@ static int ak4535_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c =kmemdup (&client_template,sizeof (client_template),GFP_KERNEL ); -if (i2c ==NULL ) { -kfree (codec); +if (i2c ==NULL )return -ENOMEM ; - } +i2c_set_clientdata (i2c, codec); codec->control_data = i2c;
@@ -583,7 +582,6 @@ static int ak4535_codec_probe(struct i2c_adapter *adap, int addr, int kind)return ret; err: -kfree (codec);kfree (i2c);return ret; }
@@ -660,6 +658,11 @@ static int ak4535_probe(struct platform_device *pdev)#else /* Add other interfaces here */ #endif + +if (ret !=0 ) { +kfree (codec->private_data); +kfree (codec); + }return ret; }
sound/soc/codecs/tlv320aic3x.c +7 -4
@@ -1199,10 +1199,9 @@ static int aic3x_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c =kmemdup (&client_template,sizeof (client_template),GFP_KERNEL ); -if (i2c ==NULL ) { -kfree (codec); +if (i2c ==NULL )return -ENOMEM ; - } +i2c_set_clientdata (i2c, codec); codec->control_data = i2c;
@@ -1221,7 +1220,6 @@ static int aic3x_codec_probe(struct i2c_adapter *adap, int addr, int kind)return ret; err: -kfree (codec);kfree (i2c);return ret; }
@@ -1302,6 +1300,11 @@ static int aic3x_probe(struct platform_device *pdev)#else /* Add other interfaces here */ #endif + +if (ret !=0 ) { +kfree (codec->private_data); +kfree (codec); + }return ret; }
sound/soc/codecs/uda1380.c +5 -4
@@ -729,10 +729,9 @@ static int uda1380_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c =kmemdup (&client_template,sizeof (client_template),GFP_KERNEL ); -if (i2c ==NULL ) { -kfree (codec); +if (i2c ==NULL )return -ENOMEM ; - } +i2c_set_clientdata (i2c, codec); codec->control_data = i2c;
@@ -750,7 +749,6 @@ static int uda1380_codec_probe(struct i2c_adapter *adap, int addr, int kind)return ret; err: -kfree (codec);kfree (i2c);return ret; }
@@ -817,6 +815,9 @@ static int uda1380_probe(struct platform_device *pdev)#else /* Add other interfaces here */ #endif + +if (ret !=0 ) +kfree (codec);return ret; }
sound/soc/codecs/wm8510.c +5 -4
@@ -693,10 +693,9 @@ static int wm8510_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c =kmemdup (&client_template,sizeof (client_template),GFP_KERNEL ); -if (i2c ==NULL ) { -kfree (codec); +if (i2c ==NULL )return -ENOMEM ; - } +i2c_set_clientdata (i2c, codec); codec->control_data = i2c;
@@ -714,7 +713,6 @@ static int wm8510_codec_probe(struct i2c_adapter *adap, int addr, int kind)return ret; err: -kfree (codec);kfree (i2c);return ret; }
@@ -782,6 +780,9 @@ static int wm8510_probe(struct platform_device *pdev)#else /* Add other interfaces here */ #endif + +if (ret !=0 ) +kfree (codec);return ret; }
sound/soc/codecs/wm8731.c +7 -4
@@ -596,10 +596,9 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c =kmemdup (&client_template,sizeof (client_template),GFP_KERNEL ); -if (i2c ==NULL ) { -kfree (codec); +if (i2c ==NULL )return -ENOMEM ; - } +i2c_set_clientdata (i2c, codec); codec->control_data = i2c;
@@ -617,7 +616,6 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind)return ret; err: -kfree (codec);kfree (i2c);return ret; }
@@ -693,6 +691,11 @@ static int wm8731_probe(struct platform_device *pdev)#else /* Add other interfaces here */ #endif + +if (ret !=0 ) { +kfree (codec->private_data); +kfree (codec); + }return ret; }
sound/soc/codecs/wm8750.c +6 -4
@@ -869,10 +869,9 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c =kmemdup (&client_template,sizeof (client_template),GFP_KERNEL ); -if (i2c ==NULL ) { -kfree (codec); +if (i2c ==NULL )return -ENOMEM ; - } +i2c_set_clientdata (i2c, codec); codec->control_data = i2c;
@@ -890,7 +889,6 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind)return ret; err: -kfree (codec);kfree (i2c);return ret; }
@@ -966,6 +964,10 @@ static int wm8750_probe(struct platform_device *pdev)/* Add other interfaces here */ #endif +if (ret !=0 ) { +kfree (codec->private_data); +kfree (codec); + }return ret; }
sound/soc/codecs/wm8753.c +7 -4
@@ -1660,10 +1660,9 @@ static int wm8753_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c =kmemdup (&client_template,sizeof (client_template),GFP_KERNEL ); -if (!i2c) { -kfree (codec); +if (!i2c)return -ENOMEM ; - } +i2c_set_clientdata (i2c, codec); codec->control_data = i2c;
@@ -1682,7 +1681,6 @@ static int wm8753_codec_probe(struct i2c_adapter *adap, int addr, int kind)return ret; err: -kfree (codec);kfree (i2c);return ret; }
@@ -1759,6 +1757,11 @@ static int wm8753_probe(struct platform_device *pdev)#else /* Add other interfaces here */ #endif + +if (ret !=0 ) { +kfree (codec->private_data); +kfree (codec); + }return ret; }
sound/soc/codecs/wm8990.c +7 -4
@@ -1500,10 +1500,9 @@ static int wm8990_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c =kmemdup (&client_template,sizeof (client_template),GFP_KERNEL ); -if (i2c ==NULL ) { -kfree (codec); +if (i2c ==NULL )return -ENOMEM ; - } +i2c_set_clientdata (i2c, codec); codec->control_data = i2c;
@@ -1521,7 +1520,6 @@ static int wm8990_codec_probe(struct i2c_adapter *adap, int addr, int kind)return ret; err: -kfree (codec);kfree (i2c);return ret; }
@@ -1595,6 +1593,11 @@ static int wm8990_probe(struct platform_device *pdev)#else /* Add other interfaces here */ #endif + +if (ret !=0 ) { +kfree (codec->private_data); +kfree (codec); + }return ret; }
Signature · 1 line
1.5.6.3
At Mon, 25 Aug 2008 11:49:20 +0100,
Quoted 13 lines · Mark Brown
From: Jean Delvare <[email protected]>
Many SoC audio codec drivers have improper freeing of memory in error paths.
* codec is allocated in the platform device probe function, but is not freed there in case of error. Instead it is freed in the i2c device probe function's error path. However the success or failure of both functions is not linked, so this could result in a double free (if the platform device is successfully probed, the i2c device probing fails and then the platform driver is unregistered.)
Quoted 7 lines
*
codec->private_datais allocated in many platform device probe functions but not freed in their error paths.This patch hopefully solves all these problems.
Signed-off-by Jean Delvare <[email protected]>Signed-off-by Mark Brown <[email protected]>
This looks like a 2.6.27 material, right?
I applied to for-linus branch now. Thanks.
Takashi
Quoted 1 line · Takashi Iwai
This looks like a 2.6.27 material, right?
Ideally, yes.
Quoted 1 line
I applied to for-linus branch now. Thanks.
Thanks.
At Mon, 25 Aug 2008 13:11:49 +0100,
Quoted 6 lines · Mark Brown
Quoted 1 line · Takashi Iwai
This looks like a 2.6.27 material, right?
Ideally, yes.
FYI, it was merged to the upstream.
thanks,
Takashi
Quoted 10 lines · Takashi Iwai
At Mon, 25 Aug 2008 13:11:49 +0100,
Quoted 6 lines · Mark Brown
Quoted 1 line · Takashi Iwai
This looks like a 2.6.27 material, right?
Ideally, yes.
FYI, it was merged to the upstream.
Great, thanks Takashi.
Signature · 1 line
Jean Delvare