Commit a3d7f22e authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Mauro Carvalho Chehab
Browse files

media: cx23885: check allocation return 



Checking of kmalloc() seems to have been committed - as
cx23885_dvb_register() is checking for != 0 return, returning
-ENOMEM should be fine here.  While at it address the coccicheck
suggestion to move to kmemdup rather than using kmalloc+memcpy.

Fixes: 46b21bba ("[media] Add support for DViCO FusionHDTV DVB-T Dual Express2")

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 981fbe3d

drivers/media/pci/cx23885/cx23885-dvb.c

+3 −2
Original line number Diff line number Diff line
@@ -1474,8 +1474,9 @@ static int dvb_register(struct cx23885_tsport *port) 
		if (fe0->dvb.frontend != NULL) {

			struct i2c_adapter *tun_i2c;



			fe0->dvb.frontend->sec_priv = kmalloc(sizeof(dib7000p_ops), GFP_KERNEL);

			memcpy(fe0->dvb.frontend->sec_priv, &dib7000p_ops, sizeof(dib7000p_ops));

			fe0->dvb.frontend->sec_priv = kmemdup(&dib7000p_ops, sizeof(dib7000p_ops), GFP_KERNEL);

			if (!fe0->dvb.frontend->sec_priv)

				return -ENOMEM;

			tun_i2c = dib7000p_ops.get_i2c_master(fe0->dvb.frontend, DIBX000_I2C_INTERFACE_TUNER, 1);

			if (!dvb_attach(dib0070_attach, fe0->dvb.frontend, tun_i2c, &dib7070p_dib0070_config))

				return -ENODEV;