Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3051e41a authored by Jean Delvare's avatar Jean Delvare Committed by Takashi Iwai
Browse files

ALSA: ASoC: Fix double free and memory leak in many codec drivers 



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.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c5d44423

sound/soc/codecs/ak4535.c

+7 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

}