Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp488772yba; Mon, 1 Apr 2019 10:18:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKYkB1ND0vwLn1VOtypDxiqBf+Nu28unaRGEfW+BmFPmen8p9NeRZQW7l2K/Z5lrMZ0nan X-Received: by 2002:a17:902:54f:: with SMTP id 73mr65971790plf.210.1554139100827; Mon, 01 Apr 2019 10:18:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554139100; cv=none; d=google.com; s=arc-20160816; b=irwmFFqg7fHa2WSPjQb+RLWpMcYq7ndjlRixJcBxWRozwq3RFR/qYE0vEvWhCkoYiy nzMoSPlAL44c62soX6Yy6DmWG65zk8m8qNuU8Orqg4fVdUp7Kpoj0qQZkk/Cy4ZCDZI7 p6gG6Itr8refNOn7zFCZFwWmh85YMoBXOnusxgJ1zLSxNrw77xbDDoLWpYsZyJXmB3pa zcl/LUOZLak6VjO5ArGdT0i0cRw+2BuqF2MGbEgOaTT1M7U2a5OSU4g1c3ovW5ilRbqi R5ILoMYP5wme3CaAfxvm/Z3L7dOOtHVCHukNYrN1IIgsnLcRMZ69wqVn6HIe/dwvZXkg gQaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NcAQDIpqnlPFRv+4D1VWFjK8pXds3b8nQdQQ76Rh09U=; b=Tk9e7Xe2cwzSxdW/TeHHCfN0MhghW+UDoQ31y9CJtD60u5NZT+dQEA5hJjLu1YLUb2 7lTbE+Z2Oxk3F/qjFI+NzjvsxcZSO6iS1Akp36WIvXxFGcQVg7u/BQV7LsckwlqQVqWL 7+0iMV4sXxVX7AHU+n4v1Usw/LXze+MABXNQCJPaeWvrqtN0yMp5f51xRppj09dZOL7y og/sAUSVowae1DXdW5zpckKQTR2sOjct45EJbpW6l40lEk2POEuLfxPUbWcZRO0912DF dxutXIPDImti/1Fzoa3eibDT3OPBbVuDt1AWH0HxhpAI1mgqdCqZka5vixPuUXI7U5fD hYXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=it20+sj1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q1si4947066pgh.396.2019.04.01.10.18.05; Mon, 01 Apr 2019 10:18:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=it20+sj1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731133AbfDARRK (ORCPT + 99 others); Mon, 1 Apr 2019 13:17:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:42962 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730425AbfDARRJ (ORCPT ); Mon, 1 Apr 2019 13:17:09 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B298C206C0; Mon, 1 Apr 2019 17:17:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139028; bh=gRNKUdHSmJ5qFY9axlxVYghT1TUStAWLdnIJjAg5ZAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=it20+sj1/x5T+e0U0qldYHg7tay3VqKQFi5JUcG/MBAq8MZTWGWdpDqpKh7P5I+qH av6iXhV8DIhQBd3Qd/TyQYKFd3setcGDkcl0EK88XYspx7a8rH9xm2thsCIM4BLsyH 2TUqKtF1gsDwRvGH+4ivbxqgV02hcQiXwoL+ELaM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lin Yi , Johan Hovold Subject: [PATCH 4.19 091/134] USB: serial: mos7720: fix mos_parport refcount imbalance on error path Date: Mon, 1 Apr 2019 19:02:07 +0200 Message-Id: <20190401170052.772147186@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170044.243719205@linuxfoundation.org> References: <20190401170044.243719205@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lin Yi commit 2908b076f5198d231de62713cb2b633a3a4b95ac upstream. The write_parport_reg_nonblock() helper takes a reference to the struct mos_parport, but failed to release it in a couple of error paths after allocation failures, leading to a memory leak. Johan said that move the kref_get() and mos_parport assignment to the end of urbtrack initialisation is a better way, so move it. and mos_parport do not used until urbtrack initialisation. Signed-off-by: Lin Yi Fixes: b69578df7e98 ("USB: usbserial: mos7720: add support for parallel port on moschip 7715") Cc: stable # 2.6.35 Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/mos7720.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c @@ -366,8 +366,6 @@ static int write_parport_reg_nonblock(st if (!urbtrack) return -ENOMEM; - kref_get(&mos_parport->ref_count); - urbtrack->mos_parport = mos_parport; urbtrack->urb = usb_alloc_urb(0, GFP_ATOMIC); if (!urbtrack->urb) { kfree(urbtrack); @@ -388,6 +386,8 @@ static int write_parport_reg_nonblock(st usb_sndctrlpipe(usbdev, 0), (unsigned char *)urbtrack->setup, NULL, 0, async_complete, urbtrack); + kref_get(&mos_parport->ref_count); + urbtrack->mos_parport = mos_parport; kref_init(&urbtrack->ref_count); INIT_LIST_HEAD(&urbtrack->urblist_entry);