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

Commit fd322396 authored by Colin Ian King's avatar Colin Ian King Committed by Mauro Carvalho Chehab
Browse files

[media] helene: fix memory leak when heleno_x_pon fails 



The error return path of failed calls to heleno_x_pon leak
memory because priv is not kfree'd.  Fix this by kfree'ing
priv before returning.

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarAbylay Ospan <aospan@netup.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 5e015c0e

drivers/media/dvb-frontends/helene.c

+6 −2
Original line number Diff line number Diff line
@@ -987,8 +987,10 @@ struct dvb_frontend *helene_attach_s(struct dvb_frontend *fe, 
	if (fe->ops.i2c_gate_ctrl)

		fe->ops.i2c_gate_ctrl(fe, 1);



	if (helene_x_pon(priv) != 0)

	if (helene_x_pon(priv) != 0) {

		kfree(priv);

		return NULL;

	}



	if (fe->ops.i2c_gate_ctrl)

		fe->ops.i2c_gate_ctrl(fe, 0);
@@ -1021,8 +1023,10 @@ struct dvb_frontend *helene_attach(struct dvb_frontend *fe, 
	if (fe->ops.i2c_gate_ctrl)

		fe->ops.i2c_gate_ctrl(fe, 1);



	if (helene_x_pon(priv) != 0)

	if (helene_x_pon(priv) != 0) {

		kfree(priv);

		return NULL;

	}



	if (fe->ops.i2c_gate_ctrl)

		fe->ops.i2c_gate_ctrl(fe, 0);