lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 267/639] media: cx23885: check allocation return
    Date
    From: Nicholas Mc Guire <hofrat@osadl.org>

    [ Upstream commit a3d7f22ef34ec4206b50ee121384d5c8bebd5591 ]

    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: 46b21bbaa8a8 ("[media] Add support for DViCO FusionHDTV DVB-T Dual Express2")

    Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
    Signed-off-by: Sean Young <sean@mess.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/pci/cx23885/cx23885-dvb.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
    index 7d52173073d6e..bafcb39822747 100644
    --- a/drivers/media/pci/cx23885/cx23885-dvb.c
    +++ b/drivers/media/pci/cx23885/cx23885-dvb.c
    @@ -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;
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:15    [W:2.148 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site