git.openwrt.org Git - openwrt/staging/981213.git/blob

   1 From 6d59110f7aa7c86caf2c3a29169ace33556f690b Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Wed, 6 Nov 2019 13:58:08 +0000
   4 Subject: [PATCH] staging: bcm2835-codec: Fix potential memory leak of
   5  isp instance
   6
   7 "d867785 staging: bcm2835-codec: add media controller support" added
   8 a new error path that jumped to end, but didn't add the free
   9 of the ISP device should that path be taken.
  10 Fix this.
  11
  12 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  13 ---
  14  .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c  | 4 ++++
  15  1 file changed, 4 insertions(+)
  16
  17 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
  18 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
  19 @@ -2841,6 +2841,10 @@ static int bcm2835_codec_probe(struct pl
  20         return 0;
  21
  22  out:
  23 +       if (drv->isp) {
  24 +               bcm2835_codec_destroy(drv->isp);
  25 +               drv->isp = NULL;
  26 +       }
  27         if (drv->encode) {
  28                 bcm2835_codec_destroy(drv->encode);
  29                 drv->encode = NULL;