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

Commit 34d7c248 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx-input: NULL dereference on error 



We call "kfree(ir->i2c_client);" in the error handling and that doesn't
work if "ir" is NULL.

Fixes: 78e719a5 ('[media] em28xx-input: i2c IR decoders: improve i2c_client handling')

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1a5cfd02

drivers/media/usb/em28xx/em28xx-input.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -712,8 +712,10 @@ static int em28xx_ir_init(struct em28xx *dev) 
	em28xx_info("Registering input extension\n");

	em28xx_info("Registering input extension\n");





	ir = kzalloc(sizeof(*ir), GFP_KERNEL);

	ir = kzalloc(sizeof(*ir), GFP_KERNEL);

	if (!ir)

		return -ENOMEM;

	rc = rc_allocate_device();

	rc = rc_allocate_device();

	if (!ir || !rc)

	if (!rc)

		goto error;

		goto error;





	/* record handles to ourself */

	/* record handles to ourself */