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=-11.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 0FF4CC2D0A3 for ; Mon, 9 Nov 2020 17:52:11 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 885B72067D for ; Mon, 9 Nov 2020 17:52:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xGDigb6G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 885B72067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Y+5huxQZqjXbinZEboHiT07egT7f3oX7+x5xzSePg2w=; b=xGDigb6Gj50Xw8VskeagituZu fumj2hwre9c/sIiPkXovWE5bv1g0S9m8IGKhPFo+XNAsR/UmtQWFgwpOUQ1QlvY6Ef0+dtMEogJDA wCNtiFX3bOtUq1GBS7+bzpYrGG7cINDLLxsFho9cLZCjxSBjiOYilycATmIyzBBpsbmaLW9P4P2Vo 93xt2IuHN3ei19n9mPxfSm+YEOAh/toKeKcsNukQUrUB0RFlku1Po0OOxG8YPyYpsxi1i59qf0t88 /kXOxbT+eEefEI4Oxa7BZWByO+6b+r72Anm4Te0nAsULirzzbbCnRlfPCdgYQrVMj+tq2Saa/8DJ6 lhzCFNoVg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcBKU-0002Li-5p; Mon, 09 Nov 2020 17:51:46 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcBKQ-0002HN-J1 for linux-arm-kernel@lists.infradead.org; Mon, 09 Nov 2020 17:51:43 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9B46931B; Mon, 9 Nov 2020 09:51:39 -0800 (PST) Received: from e120937-lin (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E47893F718; Mon, 9 Nov 2020 09:51:38 -0800 (PST) Date: Mon, 9 Nov 2020 17:51:36 +0000 From: Cristian Marussi To: Qinglang Miao Subject: Re: [PATCH] firmware: arm_scmi: fix missing destroy_workqueue() on error in scmi_notification_init Message-ID: <20201109175136.GB42652@e120937-lin> References: <20201109091517.55895-1-miaoqinglang@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201109091517.55895-1-miaoqinglang@huawei.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201109_125142_700835_DCB5901F X-CRM114-Status: GOOD ( 20.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sudeep Holla Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Nov 09, 2020 at 05:15:17PM +0800, Qinglang Miao wrote: > Add the missing destroy_workqueue() before return from > scmi_notification_init in the error handling case when > fails to do devm_kcalloc(). > > Fixes: bd31b249692e ("firmware: arm_scmi: Add notification dispatch and delivery") > Signed-off-by: Qinglang Miao > --- > drivers/firmware/arm_scmi/notify.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/firmware/arm_scmi/notify.c b/drivers/firmware/arm_scmi/notify.c > index 2754f9d01636..3048e57d9731 100644 > --- a/drivers/firmware/arm_scmi/notify.c > +++ b/drivers/firmware/arm_scmi/notify.c > @@ -1476,8 +1476,10 @@ int scmi_notification_init(struct scmi_handle *handle) > > ni->registered_protocols = devm_kcalloc(handle->dev, SCMI_MAX_PROTO, > sizeof(char *), GFP_KERNEL); > - if (!ni->registered_protocols) > + if (!ni->registered_protocols) { > + destroy_workqueue(ni->notify_wq); > goto err; > + } > Good catch, looks good to me. Even better you could move the above alloc_workqueue() block down here so that you can avoid all together the additional destroy_workqueue() on the above error path. Thanks Cristian > mutex_init(&ni->pending_mtx); > hash_init(ni->pending_events_handlers); > -- > 2.23.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel