From patchwork Sun Oct 30 01:36:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 37820 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c0f3N-0003mN-He; Sun, 30 Oct 2016 01:36:53 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-8) with esmtp id 1c0f3K-0001Z3-m4; Sun, 30 Oct 2016 02:36:52 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754496AbcJ3Bgr (ORCPT + 1 other); Sat, 29 Oct 2016 21:36:47 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36668 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753591AbcJ3Bgr (ORCPT ); Sat, 29 Oct 2016 21:36:47 -0400 Received: by mail-pf0-f196.google.com with SMTP id n85so5027614pfi.3 for ; Sat, 29 Oct 2016 18:36:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IslZW/9xoYAewL4hNE2hzNWWF3els9mi5bxh0fFPZvI=; b=eNjo9RwgwlspnADBfoEmh8wtXR7dgKko7vmvqCUEAoIagnU3HJVZGftD14+TbrQxey ZloirI/hnOIiJ3FZocBseSEugZv0405wmAnGewonOkmFKG3TgOOk+CvCiL2PUxEBm4tW Sq6EOWtqbiyoUCsFc3HeJcpsvj4+uwzG+bEAGUIE4LoDibMMMfuK7RPzCTdXeuUuSo37 FomwOSD5Lh40UQPWhDFpZnbRVebvlFdd+RsUyFEJilxhTzab+oUnFG5Y/cmK0v/bo3ls daFjSWw0NKu9Pc5Cj+de9LAsgc4wFhl+3F69s1HVAUcRKhXzOImsEjOFruqNd+FjGtRs Oi4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IslZW/9xoYAewL4hNE2hzNWWF3els9mi5bxh0fFPZvI=; b=L1fyTMDyc3vLFKYHor8HLFF19GhQQKMBUXWiwTyg7DppE618XIRsjAzf6WEdaQrmPR 8bUbtC3OEKydVnvI/Tadu/Kw8R6AZZ0CyznI4AWGqDVFwUo5xEP9WzY7micJMePSZfbt 1IRK/nGKpyXwdy6TaQcA7XEQVn7lLZRzgYt29XqYPPgDJ2LzcQfMBITPfCfRS8Usb6p3 +iLfbvhJu6eDkWcpS1vGdqe7YwMkTsSqyg9bmmGZimneJMzSubcjpXuQGR4yvVjgGoTe h7I6bqve/BUNdYhdHRKToIexxqYqq4ZHfXkl/+kcIevTNTi4UVmKNrC/UerIihT12t9S wRLw== X-Gm-Message-State: ABUngvevspG3viB2PtF+B4JWxlyd3zIGDJrPMfMvZMxDb2q3NjBsdH9CKANNzAMiBBHTCw== X-Received: by 10.98.200.15 with SMTP id z15mr37824878pff.128.1477791406301; Sat, 29 Oct 2016 18:36:46 -0700 (PDT) Received: from 192.168.0.37 (ec2-52-192-197-227.ap-northeast-1.compute.amazonaws.com. [52.192.197.227]) by smtp.gmail.com with ESMTPSA id 3sm27564018pam.21.2016.10.29.18.36.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Oct 2016 18:36:45 -0700 (PDT) From: Wei Yongjun To: Mauro Carvalho Chehab , Patrick Boettcher , Arnd Bergmann , Andrew Morton , Masahiro Yamada Cc: Wei Yongjun , linux-media@vger.kernel.org Subject: [PATCH -next] [media] dibusb: fix possible memory leak in dibusb_rc_query() Date: Sun, 30 Oct 2016 01:36:24 +0000 Message-Id: <1477791384-13845-1-git-send-email-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.10.30.13017 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, NO_URI_HTTPS 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __YOUTUBE_RCVD 0' From: Wei Yongjun 'buf' is malloced in dibusb_rc_query() and should be freed before leaving from the error handling cases, otherwise it will cause memory leak. Fixes: ff1c123545d7 ("[media] dibusb: handle error code on RC query") Signed-off-by: Wei Yongjun --- drivers/media/usb/dvb-usb/dibusb-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c index de3ee25..8207e69 100644 --- a/drivers/media/usb/dvb-usb/dibusb-common.c +++ b/drivers/media/usb/dvb-usb/dibusb-common.c @@ -382,9 +382,9 @@ int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state) if (buf[0] != 0) deb_info("key: %*ph\n", 5, buf); +ret: kfree(buf); -ret: return ret; } EXPORT_SYMBOL(dibusb_rc_query);