From patchwork Mon Sep 24 23:30:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guido Kiener X-Patchwork-Id: 10612965 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5BD4317D2 for ; Mon, 24 Sep 2018 22:33:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56F4A2A360 for ; Mon, 24 Sep 2018 22:33:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B4F32A374; Mon, 24 Sep 2018 22:33:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDF7E2A36E for ; Mon, 24 Sep 2018 22:33:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726377AbeIYEiR (ORCPT ); Tue, 25 Sep 2018 00:38:17 -0400 Received: from mr06.mx01.tldhost.de ([62.108.41.213]:49197 "EHLO mr06.mx01.tldhost.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725944AbeIYEiQ (ORCPT ); Tue, 25 Sep 2018 00:38:16 -0400 Received: from mx01.tldhost.de (localhost [127.0.0.1]) by mx01.tldhost.de (Postfix) with ESMTP id 83F71120FAB for ; Tue, 25 Sep 2018 00:33:48 +0200 (CEST) Received: by mx01.tldhost.de (Postfix, from userid 1001) id 7373C120EF1; Tue, 25 Sep 2018 00:33:48 +0200 (CEST) Received: from server12.tldhost.de (server12.tldhost.de [84.19.26.112]) by mx01.tldhost.de (Postfix) with ESMTPS id 67A50120F6A; Tue, 25 Sep 2018 00:33:46 +0200 (CEST) From: Guido Kiener To: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, guido.kiener@rohde-schwarz.com, oneukum@suse.com, dan.carpenter@oracle.com, steve_bayless@keysight.com, dpenkler@gmail.com Subject: [PATCH 1/4] usb: usbtmc: Fix memory leak in usbtmc_ioctl_request Date: Tue, 25 Sep 2018 01:30:29 +0200 Message-Id: <20180924233032.2379-2-guido@kiener-muenchen.de> In-Reply-To: <20180924233032.2379-1-guido@kiener-muenchen.de> References: <20180924233032.2379-1-guido@kiener-muenchen.de> X-PPP-Message-ID: <20180924223348.22109.38509@server12.tldhost.de> X-PPP-Vhost: kiener-muenchen.de X-POWERED-BY: TLDHost.de - AV:CLEAN SPAM:OK Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Guido Kiener Kernel memory is allocated twice in new function usbtmc_ioctl_request and creates a memory leak. This fix removes the superfluous kmalloc(). Signed-off-by: Guido Kiener Fixes: 658f24f4523e ("usb: usbtmc: Add ioctl for generic requests on control") --- drivers/usb/class/usbtmc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 0fcb81a1399b..dfbcf418dad7 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -1895,10 +1895,6 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data, if (res) return -EFAULT; - buffer = kmalloc(request.req.wLength, GFP_KERNEL); - if (!buffer) - return -ENOMEM; - if (request.req.wLength > USBTMC_BUFSIZE) return -EMSGSIZE; From patchwork Mon Sep 24 23:30:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guido Kiener X-Patchwork-Id: 10612969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8BF4D1390 for ; Mon, 24 Sep 2018 22:33:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86C842A360 for ; Mon, 24 Sep 2018 22:33:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B1DB2A374; Mon, 24 Sep 2018 22:33:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AC8D2A360 for ; Mon, 24 Sep 2018 22:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726392AbeIYEiR (ORCPT ); Tue, 25 Sep 2018 00:38:17 -0400 Received: from mr06.mx01.tldhost.de ([62.108.41.213]:58594 "EHLO mr06.mx01.tldhost.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725931AbeIYEiQ (ORCPT ); Tue, 25 Sep 2018 00:38:16 -0400 Received: from mx01.tldhost.de (localhost [127.0.0.1]) by mx01.tldhost.de (Postfix) with ESMTP id 217FA120F6A for ; Tue, 25 Sep 2018 00:33:49 +0200 (CEST) Received: by mx01.tldhost.de (Postfix, from userid 1001) id 11708120F6F; Tue, 25 Sep 2018 00:33:49 +0200 (CEST) Received: from server12.tldhost.de (server12.tldhost.de [84.19.26.112]) by mx01.tldhost.de (Postfix) with ESMTPS id 06F53120F72; Tue, 25 Sep 2018 00:33:47 +0200 (CEST) From: Guido Kiener To: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, guido.kiener@rohde-schwarz.com, oneukum@suse.com, dan.carpenter@oracle.com, steve_bayless@keysight.com, dpenkler@gmail.com Subject: [PATCH 2/4] usb: usbtmc: uninitialized symbol 'actual' in usbtmc_read Date: Tue, 25 Sep 2018 01:30:30 +0200 Message-Id: <20180924233032.2379-3-guido@kiener-muenchen.de> In-Reply-To: <20180924233032.2379-1-guido@kiener-muenchen.de> References: <20180924233032.2379-1-guido@kiener-muenchen.de> X-PPP-Message-ID: <20180924223348.22121.88042@server12.tldhost.de> X-PPP-Vhost: kiener-muenchen.de X-POWERED-BY: TLDHost.de - AV:CLEAN SPAM:OK Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Guido Kiener Fix uninitialized symbol 'actual' in function usbtmc_read. When symbol 'actual' is not initialized and usb_bulk_msg() fails, the subsequent kernel debug message shows a random value. Signed-off-by: Guido Kiener Fixes: d7604ff0dc01 ("usb: usbtmc: Optimize usbtmc_read") --- drivers/usb/class/usbtmc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index dfbcf418dad7..9cb90603f71f 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -1370,6 +1370,7 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf, /* Loop until we have fetched everything we requested */ remaining = count; + actual = 0; /* Send bulk URB */ retval = usb_bulk_msg(data->usb_dev, From patchwork Mon Sep 24 23:30:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guido Kiener X-Patchwork-Id: 10612967 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C019D1390 for ; Mon, 24 Sep 2018 22:33:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B89BE2A360 for ; Mon, 24 Sep 2018 22:33:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACF7C2A36E; Mon, 24 Sep 2018 22:33:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BCE82A385 for ; Mon, 24 Sep 2018 22:33:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726395AbeIYEiR (ORCPT ); Tue, 25 Sep 2018 00:38:17 -0400 Received: from mr05.mx01.tldhost.de ([62.108.36.228]:48291 "EHLO mr05.mx01.tldhost.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725986AbeIYEiR (ORCPT ); Tue, 25 Sep 2018 00:38:17 -0400 Received: from mx01.tldhost.de (localhost [127.0.0.1]) by mx01.tldhost.de (Postfix) with ESMTP id A42DE120F6D for ; Tue, 25 Sep 2018 00:33:49 +0200 (CEST) Received: by mx01.tldhost.de (Postfix, from userid 1001) id 94DD5120F95; Tue, 25 Sep 2018 00:33:49 +0200 (CEST) Received: from server12.tldhost.de (server12.tldhost.de [84.19.26.112]) by mx01.tldhost.de (Postfix) with ESMTPS id 88E2E120F9C; Tue, 25 Sep 2018 00:33:47 +0200 (CEST) From: Guido Kiener To: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, guido.kiener@rohde-schwarz.com, oneukum@suse.com, dan.carpenter@oracle.com, steve_bayless@keysight.com, dpenkler@gmail.com Subject: [PATCH 3/4] usb: usbtmc: uninitialized symbol 'actual' in usbtmc_ioctl_clear Date: Tue, 25 Sep 2018 01:30:31 +0200 Message-Id: <20180924233032.2379-4-guido@kiener-muenchen.de> In-Reply-To: <20180924233032.2379-1-guido@kiener-muenchen.de> References: <20180924233032.2379-1-guido@kiener-muenchen.de> X-PPP-Message-ID: <20180924223349.22134.94041@server12.tldhost.de> X-PPP-Vhost: kiener-muenchen.de X-POWERED-BY: TLDHost.de - AV:CLEAN SPAM:OK Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Guido Kiener Fix uninitialized symbol 'actual' in function usbtmc_ioctl_clear. When symbol 'actual' is not initialized and usb_bulk_msg() fails, the subsequent kernel debug message shows a random value. Signed-off-by: Guido Kiener Fixes: dfee02ac4bce ("usb: usbtmc: Fix ioctl USBTMC_IOCTL_CLEAR") --- drivers/usb/class/usbtmc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 9cb90603f71f..7184fa035434 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -1679,6 +1679,7 @@ static int usbtmc_ioctl_clear(struct usbtmc_device_data *data) do { dev_dbg(dev, "Reading from bulk in EP\n"); + actual = 0; rv = usb_bulk_msg(data->usb_dev, usb_rcvbulkpipe(data->usb_dev, data->bulk_in), From patchwork Mon Sep 24 23:30:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guido Kiener X-Patchwork-Id: 10612971 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2E80B14BD for ; Mon, 24 Sep 2018 22:33:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A0912A360 for ; Mon, 24 Sep 2018 22:33:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E1442A374; Mon, 24 Sep 2018 22:33:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC26A2A360 for ; Mon, 24 Sep 2018 22:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726417AbeIYEiS (ORCPT ); Tue, 25 Sep 2018 00:38:18 -0400 Received: from mr07.mx01.tldhost.de ([62.108.44.247]:50503 "EHLO mr07.mx01.tldhost.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725944AbeIYEiR (ORCPT ); Tue, 25 Sep 2018 00:38:17 -0400 Received: from mx01.tldhost.de (localhost [127.0.0.1]) by mx01.tldhost.de (Postfix) with ESMTP id 4668F120F6F for ; Tue, 25 Sep 2018 00:33:50 +0200 (CEST) Received: by mx01.tldhost.de (Postfix, from userid 1001) id 316C0120F55; Tue, 25 Sep 2018 00:33:50 +0200 (CEST) Received: from server12.tldhost.de (server12.tldhost.de [84.19.26.112]) by mx01.tldhost.de (Postfix) with ESMTPS id 2A1EF120F55; Tue, 25 Sep 2018 00:33:48 +0200 (CEST) From: Guido Kiener To: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, guido.kiener@rohde-schwarz.com, oneukum@suse.com, dan.carpenter@oracle.com, steve_bayless@keysight.com, dpenkler@gmail.com Subject: [PATCH 4/4] usb: usbtmc: uninitialized symbol 'actual' in usbtmc_ioctl_abort_bulk_in_tag Date: Tue, 25 Sep 2018 01:30:32 +0200 Message-Id: <20180924233032.2379-5-guido@kiener-muenchen.de> In-Reply-To: <20180924233032.2379-1-guido@kiener-muenchen.de> References: <20180924233032.2379-1-guido@kiener-muenchen.de> X-PPP-Message-ID: <20180924223349.22144.50318@server12.tldhost.de> X-PPP-Vhost: kiener-muenchen.de X-POWERED-BY: TLDHost.de - AV:CLEAN SPAM:OK Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Guido Kiener Fix uninitialized symbol 'actual' in function usbtmc_ioctl_abort_bulk_in_tag(). When symbol 'actual' is not initialized and usb_bulk_msg() fails, the subsequent kernel debug message shows invalid data. Signed-off-by: Guido Kiener Fixes: cbe743f1333b ("usb: usbtmc: Fix ioctl USBTMC_IOCTL_ABORT_BULK_IN") --- drivers/usb/class/usbtmc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 7184fa035434..4942122b2346 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -321,6 +321,7 @@ static int usbtmc_ioctl_abort_bulk_in_tag(struct usbtmc_device_data *data, dev_dbg(dev, "Reading from bulk in EP\n"); /* Data must be present. So use low timeout 300 ms */ + actual = 0; rv = usb_bulk_msg(data->usb_dev, usb_rcvbulkpipe(data->usb_dev, data->bulk_in),