From patchwork Mon Mar 27 09:50:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Nyman X-Patchwork-Id: 75328 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1387082vqo; Mon, 27 Mar 2023 02:52:25 -0700 (PDT) X-Google-Smtp-Source: AKy350bZW1PFvmiSv/9/5z3nlMHaVJMvOXPyoeLlA2EKp98FExMC8eqD9lVsU43I1PBKtt+fuc9V X-Received: by 2002:aa7:da57:0:b0:4fb:80cf:89e6 with SMTP id w23-20020aa7da57000000b004fb80cf89e6mr12266464eds.8.1679910744877; Mon, 27 Mar 2023 02:52:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679910744; cv=none; d=google.com; s=arc-20160816; b=XCfORDrUEVJsUpOXFGkpnzZoC2dkBsWAtEwpHYqB7iKVtLoa6c3GuyUwwqySPucIq0 mWp3lLHhqlLjWVmJJ6tq870mb0qrkEE8NL55YCtBSQqbhKMoK17l6M4aFJITdvptV9RM JSu0pK/pYYWXlKB9tTibv6E4IQ7jUIptppTHw+IcWcgA18xpAlJqDeXJRgLQzTm9Rvyo 0CEoYxxtmxmlKCl4TwnwAtiF+KhPU+affmiCU72TiE9dkAUSvwG8SvppppN6ycmfFh4V BUM9AFpStZhS7fMtaxv8rrIXDIMpzPFs4elWJ9NiBpJjhaSo6jlyxwfY3aEpclx2MZyL I6qQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=u5KvVxNgnFKW1nB4UthXaGoHh/wqgfQv5+tZquWDs2U=; b=f6OBbSnED6qVd9nyOLenLqm7jRskpBej78bdU0tDP8K0q3nyFusDpyU/Bqx/9VAukU plRTfew9B4gC7moH9PdSSaraPSJ194N9XmIrJf361Nj7YaDqR7h4vxfAzHw6MmzRBlSn +Y+bkeNirjvBUsTkMWM8vg7ul17xz2zhSmA9PofPrRHg8vdZiSlpkcBKVO7XGfkUPbL1 BApMCUj1PJ+lyFwScdAlTLcQ0bChMCY+culb4HhUBMTypq3+UH2/CrxBDdJJyRRTdMBU wnUMxcC25ahysGJ2zQHAX7r9gdYVJr90/QWsccOv2+M6Qd2DlGC3BhaS6GlmsVJERUBZ 3Z/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="NWfeLEs/"; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b23-20020aa7d497000000b005021f0d575dsi8748584edr.676.2023.03.27.02.52.01; Mon, 27 Mar 2023 02:52:24 -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=@intel.com header.s=Intel header.b="NWfeLEs/"; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232855AbjC0Jt7 (ORCPT + 99 others); Mon, 27 Mar 2023 05:49:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233010AbjC0Jtg (ORCPT ); Mon, 27 Mar 2023 05:49:36 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74C6D5276; Mon, 27 Mar 2023 02:49:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679910574; x=1711446574; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xBeLqlQQ2ZjA9fI2W7QipMFz4tnsQ/MApd2Q6uLzh6w=; b=NWfeLEs/db/OnAuPLB6R/j58XUSxPLR2V39uZso4boMr86cwYpsg6LQL euCskZK0E1b8ZaHmp04WM6GVoKfa8K+D4++6V3YnJp9xuFBvWI/LhpJrF UHh6XMwkG8p8HJY/gpBy4yVLeQcBoGqu8srjHiLhrrALa2JoFh4io7bqe hHc0FwJmYVajyru4aEfOp1jB/A2gyqZuzRgWxJRJwi5RlJzaDJFM2oF4V dUCbHzipOmW8DNqFvNOzLJ9CauowbtcB7wa9oj6sU2bfDxzx4F8fzVzvw yVy29Lu4VhL4vm6umYWrU9lOGzoObFxnJKHI/BJVdGlVaC4rBncO2P6XB A==; X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="367968164" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="367968164" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2023 02:49:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="716017172" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="716017172" Received: from mattu-haswell.fi.intel.com ([10.237.72.199]) by orsmga001.jf.intel.com with ESMTP; 27 Mar 2023 02:49:28 -0700 From: Mathias Nyman To: mirsad.todorovac@alu.unizg.hr, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, ubuntu-devel-discuss@lists.ubuntu.com, stern@rowland.harvard.edu, arnd@arndb.de, Mathias Nyman , Stable@vger.kernel.org Subject: [PATCH] xhci: Free the command allocated for setting LPM if we return early Date: Mon, 27 Mar 2023 12:50:19 +0300 Message-Id: <20230327095019.1017159-1-mathias.nyman@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761514088971619754?= X-GMAIL-MSGID: =?utf-8?q?1761514088971619754?= The command allocated to set exit latency LPM values need to be freed in case the command is never queued. This would be the case if there is no change in exit latency values, or device is missing. Fixes: 5c2a380a5aa8 ("xhci: Allocate separate command structures for each LPM command") Cc: Signed-off-by: Mathias Nyman Reported-by: Mirsad Goran Todorovac Tested-by: Mirsad Goran Todorovac --- drivers/usb/host/xhci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index bdb6dd819a3b..6307bae9cddf 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -4442,6 +4442,7 @@ static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci, if (!virt_dev || max_exit_latency == virt_dev->current_mel) { spin_unlock_irqrestore(&xhci->lock, flags); + xhci_free_command(xhci, command); return 0; }