Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp518420yba; Mon, 1 Apr 2019 10:55:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqyY3839zpfU/gFpiGn3KUN/a9TunT9RJ59/vxI5DfS7FfCSrfTKJBjXkQK14WYnV6+AcFlg X-Received: by 2002:a62:14d7:: with SMTP id 206mr35425331pfu.162.1554141322886; Mon, 01 Apr 2019 10:55:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554141322; cv=none; d=google.com; s=arc-20160816; b=Wlu/AjXsEHgDNdDcmodeUHsal3gNJ2+KroIk9AiwZaj5lSqA1LHSlcRne6TUkHOdat 04SuLqDDmeBf83qdVnsibED4TGY/cYHHGCSN0Lsk/75Q/NHNcOs8swh/EohwvxP68FOK LpZA51zEUMDxKXBpnucGQyH/jKlM2WJtvAcANdGDiMR8NFEt6adKIw7uQ324D8ja6hso iG3sV429WYQJcNtRrR3Zih7/1j7Rv8SQfK6lBrwWfepR2NP0dgf4/LTO2Uju5XNxetzz cPF6PfZFFPq1dzKlFVQ9C1NURBtoXO/DbHyB+aHHG5a/NbcRel6AKGxsvJq1FTvqpqkg lBNA== 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=f+2O6daFwCvIIYQzodG5YLdLEdhYHdnEiCUpLdzLT0o=; b=yRiz7sHv3m44f5mwrsRbnkeRJGmRcR8zn9TNc0qK2Iw4Wo+53xRttU8TK5RDCRQLhU G3jtTix4jt8vK0zjVUSgCPLJ019+MNdApe8qPvJwc8mD0q+EJO9owYdYuZQVbOXIztVi AJOwrgIU7CnzxadGsR0rbs5FzGch2Y82iudA4lb6hF1a4JGGMkCQ5OCi3zgFuRW12O7N FyVRMAjqM3S2uBHY5OAOnkUcU1mllNVOE8hVpf/IMyL6uHiI61DiS411Gn/dXp/+ebpB hLODOQpcXLhyl+wbu9XxIqU5G5jXui9yQmf92BxC+XDedcTvg1OqhAjCQd19HNsVNiAQ krvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FiBIRohv; 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.55.07; Mon, 01 Apr 2019 10:55:22 -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=FiBIRohv; 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 S1732269AbfDARxW (ORCPT + 99 others); Mon, 1 Apr 2019 13:53:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:57598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732452AbfDARZy (ORCPT ); Mon, 1 Apr 2019 13:25:54 -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 D282420830; Mon, 1 Apr 2019 17:25:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139554; bh=kB+h7hiCb08PY0LVqrATyNabbyBnSNYc1Yi9JLKb2wU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FiBIRohvnuYpfx11DQFGPzFPSS1BsjGYZ6oBRzBdVjTekqS7aEiRTA+a6ogMTHeVF EI2AEYvqN2JAoCiUusNwhTYs/QFFI4sngI0K7Aya24HDDKNbebITSRpu7NJvYkNFQX 77DpwWzBxwKOelLEXYY99uvKoI12i79Y8lvjzwtI= 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.14 084/107] USB: serial: mos7720: fix mos_parport refcount imbalance on error path Date: Mon, 1 Apr 2019 19:02:39 +0200 Message-Id: <20190401170053.261774802@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170045.246405031@linuxfoundation.org> References: <20190401170045.246405031@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.14-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 @@ -368,8 +368,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); @@ -390,6 +388,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);