merged. Bruce
On Tue, Mar 17, 2020 at 3:01 AM Wang Mingyu <[email protected]> wrote: > > Security Advisory > > Reference to upstream patch: > https://github.com/torvalds/linux/commit/a7b2df76b42bdd026e3106cf2ba97db41345a177 > > media: rc: prevent memory leak in cx23888_ir_probe > > In cx23888_ir_probe if kfifo_alloc fails the allocated memory for state > should be released. > > Signed-off-by: Navid Emamdoost <[email protected]> > Signed-off-by: Sean Young <[email protected]> > Signed-off-by: Mauro Carvalho Chehab <[email protected]> > > Signed-off-by: Wang Mingyu <[email protected]> > --- > drivers/media/pci/cx23885/cx23888-ir.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/pci/cx23885/cx23888-ir.c > b/drivers/media/pci/cx23885/cx23888-ir.c > index 00329f668..017321134 100644 > --- a/drivers/media/pci/cx23885/cx23888-ir.c > +++ b/drivers/media/pci/cx23885/cx23888-ir.c > @@ -1178,8 +1178,11 @@ int cx23888_ir_probe(struct cx23885_dev *dev) > return -ENOMEM; > > spin_lock_init(&state->rx_kfifo_lock); > - if (kfifo_alloc(&state->rx_kfifo, CX23888_IR_RX_KFIFO_SIZE, > GFP_KERNEL)) > + if (kfifo_alloc(&state->rx_kfifo, CX23888_IR_RX_KFIFO_SIZE, > + GFP_KERNEL)) { > + kfree()state; > return -ENOMEM; > + } > > state->dev = dev; > sd = &state->sd; > -- > 2.17.1 > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8510): https://lists.yoctoproject.org/g/linux-yocto/message/8510 Mute This Topic: https://lists.yoctoproject.org/mt/72019121/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
