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=-17.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, 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 64A1CC433E0 for ; Mon, 1 Feb 2021 22:50:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E90D64DDB for ; Mon, 1 Feb 2021 22:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230064AbhBAWuh (ORCPT ); Mon, 1 Feb 2021 17:50:37 -0500 Received: from lpdvacalvio01.broadcom.com ([192.19.229.182]:48482 "EHLO relay.smtp-ext.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229515AbhBAWuf (ORCPT ); Mon, 1 Feb 2021 17:50:35 -0500 Received: from [10.136.13.65] (lbrmn-lnxub113.ric.broadcom.net [10.136.13.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by relay.smtp-ext.broadcom.com (Postfix) with ESMTPS id 9E35B7A28; Mon, 1 Feb 2021 14:49:43 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 9E35B7A28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1612219784; bh=gXml1x7AeRWAko8NYg61vJptfElb3mouLAr7jiR6V00=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=PSstxdZZ8clRqktDowAmbVoFONhDPjed19QdSq4iSIncscpsigy8I9Cqg6z6Vp3ab +Km/RBKIo3lNP1yqmkFPnBXR/W1xdC9mMTWKSPYCqCHPBNj9HQWYSIbKJVSk07Urd9 yoPLPpqAxJ64aiokkYrNvVaokBHeehjvOYR9UhOY= Subject: Re: [PATCH] misc: bcm-vk: unlock on error in bcm_to_h_msg_dequeue() To: Desmond Yan , Dan Carpenter Cc: Arnd Bergmann , Greg Kroah-Hartman , Olof Johansson , bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org References: From: Scott Branden Message-ID: Date: Mon, 1 Feb 2021 14:49:42 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-CA Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Great, looks good then. On 2021-02-01 10:32 a.m., Desmond Yan wrote: > Acked-by: Desmond Yan Acked-by: Scott Branden > > On Mon, Feb 1, 2021 at 4:24 AM Dan Carpenter wrote: >> Unlock before returning on this error path. >> >> Fixes: 111d746bb476 ("misc: bcm-vk: add VK messaging support") >> Signed-off-by: Dan Carpenter >> --- >> drivers/misc/bcm-vk/bcm_vk_msg.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/misc/bcm-vk/bcm_vk_msg.c b/drivers/misc/bcm-vk/bcm_vk_msg.c >> index eec90494777d..fc972e43258a 100644 >> --- a/drivers/misc/bcm-vk/bcm_vk_msg.c >> +++ b/drivers/misc/bcm-vk/bcm_vk_msg.c >> @@ -849,7 +849,8 @@ s32 bcm_to_h_msg_dequeue(struct bcm_vk *vk) >> * that is fatal. >> */ >> dev_crit(dev, "Kernel mem allocation failure.\n"); >> - return -ENOMEM; >> + total = -ENOMEM; >> + goto idx_err; >> } >> >> /* flush rd pointer after a message is dequeued */ >> -- >> 2.29.2 >>