From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35255C282DD for ; Thu, 23 May 2019 19:09:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D1F6217D9 for ; Thu, 23 May 2019 19:09:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638549; bh=4Iku/FjekZcjWFXaDe6eZYD6gS+UBEqFJtU66m3sppg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kWt2aNCqGNcseqLe0c2W7ahyLiGu3RUnbTm8FhA7lTefonWm4pVsukI748EMk4Lmu JHj1lNduwJK/fzi5ADx7wJamhB3OLkAt94HaDSJ7DgOVbIhukHo8m9Xo+VQUFm2q2I yp8VanBNVXITmZP94Qlq4KDaKjSw1exKP1lhflIc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732060AbfEWTJI (ORCPT ); Thu, 23 May 2019 15:09:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:42112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732039AbfEWTJH (ORCPT ); Thu, 23 May 2019 15:09:07 -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 2B52621841; Thu, 23 May 2019 19:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638546; bh=4Iku/FjekZcjWFXaDe6eZYD6gS+UBEqFJtU66m3sppg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SzVi5vP8DJE5ZUf3DjDae4+KgFXJwnYzghbykCRzxbOhEsULzXl/XvHp4auPGpTQ7 PVH0Fdgh7SnOLbhVC+xRqf454CKsBXOGn9QXOW7uDXzjVIWaDD0l9kpYnQb6zevZyX +OXB9rE0ERXWY5PG/bSCC6h4BppyF7kDfcMK4Jrg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tingwei Zhang , Sai Prakash Ranjan , Alexander Shishkin Subject: [PATCH 4.9 11/53] stm class: Fix channel free in stm output free path Date: Thu, 23 May 2019 21:05:35 +0200 Message-Id: <20190523181712.685624475@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181710.981455400@linuxfoundation.org> References: <20190523181710.981455400@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Tingwei Zhang commit ee496da4c3915de3232b5f5cd20e21ae3e46fe8d upstream. Number of free masters is not set correctly in stm free path. Fix this by properly adding the number of output channels before setting them to 0 in stm_output_disclaim(). Currently it is equivalent to doing nothing since master->nr_free is incremented by 0. Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices") Signed-off-by: Tingwei Zhang Signed-off-by: Sai Prakash Ranjan Cc: stable@vger.kernel.org # v4.4 Signed-off-by: Alexander Shishkin Signed-off-by: Greg Kroah-Hartman --- drivers/hwtracing/stm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -226,8 +226,8 @@ stm_output_disclaim(struct stm_device *s bitmap_release_region(&master->chan_map[0], output->channel, ilog2(output->nr_chans)); - output->nr_chans = 0; master->nr_free += output->nr_chans; + output->nr_chans = 0; } /*