Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1137469iob; Wed, 4 May 2022 15:42:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUV6VAoyhfKPJTwgERoKcj1PkuH4hQ6wluxe4nHSI7v7IMfY59VInwtLemq/5w+YGB2fDH X-Received: by 2002:a50:e70f:0:b0:425:da3c:4731 with SMTP id a15-20020a50e70f000000b00425da3c4731mr26164297edn.223.1651704139207; Wed, 04 May 2022 15:42:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651704139; cv=none; d=google.com; s=arc-20160816; b=o2OFvp4kU93htMu2bMe3dPpwqjbDFUoT4cKrrN4PeTF9EZDn+eGeeso8MSYPXSSh8d 6sW48cY+e86JSyTVKtGi6s2eeaDwhX+oRwa4+Y131859Zy63L+kIVCq+2UaPQ5pc5IkH ALelQWuZMGMsKCPkhcONK6amtb5p7HK9jYEj/dZzwi4ZCLlfN/VXZP08sOAYeDuy9Qpi /HFgZWYuHU/RUrNMtJc0tliOnuQhEcmJVTiVzQxYqzfSSlUVWWQdb8o2jgQbAZ8FcTnC viWbN84PCNGCNavgNmfrYg1owpWMKYyFdlW4ZD+usfzLvYR6hPEvoTp0s1rDZSrDJxg1 KIiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bJ+plbW9gqQFQi2ro7tXViiwXj5WeN9R6I35KQlrsPQ=; b=tcqB4z/5o5IXjqRG2Y5DhK3uTLLwxAmTTmFDW1MTEyRCKPG4nbkL9wn8ROT9S8Ep0U cD0iw0dH2wqDzqhq0nHzKuEtkY8aVzK1etTHxFEkLAssSP6guqyPHOsVEYCBjWzzWKcx yt/mqU8vvZXkXM8UTxBCtP5X3Cykfh7Xx2jjSs4M1iZF2HJ2bkV2gfdgYbQzmoezjDlq FamQXCmVGgrY5VxUxr0eeXOMN+BG74HHwtH0mvplUiDVZZUifW+xJaMp2/pX4qRkOTMH dWsuIXD+dU0SZcnHKaxJlMfstIZFGFLe4Emo9q+M+Ha+M500V6ScZDUY0d8QttOBQdwT xeVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=W6z051L+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ch24-20020a170906c2d800b006f384795201si237267ejb.85.2022.05.04.15.41.54; Wed, 04 May 2022 15:42:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=W6z051L+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358419AbiEDRaS (ORCPT + 99 others); Wed, 4 May 2022 13:30:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356763AbiEDRJl (ORCPT ); Wed, 4 May 2022 13:09:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E26A18E2B; Wed, 4 May 2022 09:55:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E235B617D5; Wed, 4 May 2022 16:55:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34B98C385A5; Wed, 4 May 2022 16:55:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683331; bh=9E39mHLbOPtkiWOEOKFy56IbZL3g5wvMyD0A5kF6R7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W6z051L+RsxOeNgthxEwD3IcEBYJPy9RbK9qqobnaGAjW3a6FHcJVUi/RD5TscSi7 XTA5+hB6EjyMKkG7dUefzK/8l/HMzaX4QSjiyZ0E94k5vVPcyN1hkhCZDlE//5XC+h F6W6at5AjmEUdj5gc0x9Px6EMQfFPbfjOcGJIvuo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stable , Dongliang Mu , Hangyu Hua Subject: [PATCH 5.17 018/225] usb: misc: fix improper handling of refcount in uss720_probe() Date: Wed, 4 May 2022 18:44:16 +0200 Message-Id: <20220504153111.913625937@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hangyu Hua commit 0a96fa640dc928da9eaa46a22c46521b037b78ad upstream. usb_put_dev shouldn't be called when uss720_probe succeeds because of priv->usbdev. At the same time, priv->usbdev shouldn't be set to NULL before destroy_priv in uss720_disconnect because usb_put_dev is in destroy_priv. Fix this by moving priv->usbdev = NULL after usb_put_dev. Fixes: dcb4b8ad6a44 ("misc/uss720: fix memory leak in uss720_probe") Cc: stable Reviewed-by: Dongliang Mu Signed-off-by: Hangyu Hua Link: https://lore.kernel.org/r/20220407024001.11761-1-hbh25y@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/uss720.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c @@ -71,6 +71,7 @@ static void destroy_priv(struct kref *kr dev_dbg(&priv->usbdev->dev, "destroying priv datastructure\n"); usb_put_dev(priv->usbdev); + priv->usbdev = NULL; kfree(priv); } @@ -736,7 +737,6 @@ static int uss720_probe(struct usb_inter parport_announce_port(pp); usb_set_intfdata(intf, pp); - usb_put_dev(usbdev); return 0; probe_abort: @@ -754,7 +754,6 @@ static void uss720_disconnect(struct usb usb_set_intfdata(intf, NULL); if (pp) { priv = pp->private_data; - priv->usbdev = NULL; priv->pp = NULL; dev_dbg(&intf->dev, "parport_remove_port\n"); parport_remove_port(pp);