Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4178639pxb; Mon, 1 Feb 2021 14:52:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJQbvhMiPp13I28AaezujGK5dgE4FbiBcOlCOalWpgJ8T0ib1Medl+DZ+rEvVLCPHMkWay X-Received: by 2002:a17:906:3401:: with SMTP id c1mr20412736ejb.156.1612219956145; Mon, 01 Feb 2021 14:52:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612219956; cv=none; d=google.com; s=arc-20160816; b=qU1PKsloCYWfq1hS3WwA8rLYB0wJLjeR1GRnmMeTbkibeuVcS8fJ8YI84qbJSrKCri UnsyvnpgoK5fVoVq/z7u7Wh50j/BQlXGzUEYnhrrGlw5Vbwire9WgF78NoA0PDBAGcsl 89DkVI0Dbe5/wame4z8SV9MqFHE+HWxk73Zw29Xdpi66yxBd4JxoI8EeLX/iMZJt70ux C/4y/OAlgwp73gl/Dcjhr4wO27d1oXWIKyXiukDEvkGKWI03oOLtmr8x9HynLtaW28x0 6KOQuUG2/iMwqsLjFEtj5MSUjlCNjm1DmaILVLuA0II7cLn6dG0saXV6v2Ytl/6L4JCW 8S7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-language:content-transfer-encoding :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature:dkim-filter; bh=sgfwVDeQa9DjJ2fFC3ndTmMKmvG9mzLzLMfP0h2PsS4=; b=hTz55V1d6Ol5M+bT5Sp64VRhzBJzfdqn/XD79bVXr3zCllq2KoWdhRBmQ3XJkPgUtQ 3+N0/WYayfsUKEPXmZc3fwKxXA6ajeJ7hgUs1Agz8YmBrq5qcFdfHaDjyzRWevrv64pm M8fOKBRh9pD9GR/mUdMFlMUQNHKa/Aq9ld7jIKL13GCsZCFCsQYyPB0D9SRIoSP6idW9 C0DkXPR7PNELv/6iqVpVvH+Xwr/Zq6GWzQX1XKQ7HQ49a2KC63m25aLP+gW1MZWtnJOX 6mMyCLzvljjpxWcwNbwDoUy479AdcZr2J1qp7RtwJabnd5rwvFAp977/9w9LHBGprZzl w7Vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=dkimrelay header.b=PSstxdZZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o17si11908694ejh.270.2021.02.01.14.52.11; Mon, 01 Feb 2021 14:52:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@broadcom.com header.s=dkimrelay header.b=PSstxdZZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229753AbhBAWug (ORCPT + 99 others); Mon, 1 Feb 2021 17:50:36 -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 >>