Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3990637pxb; Mon, 1 Feb 2021 09:34:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQPJ6o7BM+T8sNUfoX2HqUXSK+MzxwI9yrRpLazeAgELxSgL7HLlWJGnukBL0aZfuCIkKP X-Received: by 2002:a17:906:719:: with SMTP id y25mr11822017ejb.180.1612200891440; Mon, 01 Feb 2021 09:34:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612200891; cv=none; d=google.com; s=arc-20160816; b=H8oABKxTr9zGJD43HXq+Tlb7a+LXn1h2hl9uC6ceHYuJ4Eh1X6pOTvLn40b9gbMylp +NcnNTb7v5FdgAn0dCxV0iNphHNtoJiF1Tt62bps8rcssIJqhp8uXYVoemKvnB0+k1Hb XKSmZeO6/+QzAnYj2eA5hNcXpMUr5zpWvs/lupO7MbiHF7PENMpJZRUHpYU0/bAoZxAX cKfUzkOKBrYTj+kURwWaLU2iaHFPA7jQEK7+agm2KR/P3F+7/FPqHwp6o5WJeVMacWA7 889C9CLYxOllqOd3WTWBhE5qwR9qapOsNNhobDrcrt/Shc9+CXuG1dA7l1FI9vr9hLnP DQYQ== 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=Nm1Symg/AcXFiV+uT1j9uy991iKqIOA00GbprC7TWD4=; b=E1cRB/H2STRan37eDUi2IBJYVNU36PhYubeUEL1aS9B5AHp5MmUQhEbr7AEj2QDNoD CuzLz55m4yaVIUzWCBVKzofmEgC9VneWpw1UJufSEyBEwy9P3DD7O9/3aBR23vuANnXf IzeRqmN9TCBRkSsZRzr2iAR0Gsb6wU+b+YtPAKNyu9DjwePeVLbije9ArmXLZYOK9PF7 rTB9FOpEvdcfm6NKjnBox/baVrRii95Sp8joNuhWviHYGcQXJKWjaE3Dfkj0rdO8DKyj fqLIBxX+9tYE1QbhQeU3FSyFXqPz6LiyCiDoEhfB5CcaaVE/y7PX43e65D5Jiq6suMMo 0gNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=dkimrelay header.b="QpuYK2w/"; 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 h10si10684947ejb.554.2021.02.01.09.34.24; Mon, 01 Feb 2021 09:34:51 -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="QpuYK2w/"; 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 S231475AbhBARcn (ORCPT + 99 others); Mon, 1 Feb 2021 12:32:43 -0500 Received: from lpdvacalvio01.broadcom.com ([192.19.229.182]:48078 "EHLO relay.smtp-ext.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232021AbhBARcM (ORCPT ); Mon, 1 Feb 2021 12:32:12 -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 57C927DC5; Mon, 1 Feb 2021 09:31:18 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 57C927DC5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1612200678; bh=ii84u06WrT1wiRPFXlO0+eF4/FLJ4dFwcrOss1Lc6eA=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=QpuYK2w/7lPWXicgXQL/GcriLG2q2s1bXucpzb/a/peLGHJud2LpfTe5ceUb8ON5q nSwQhYA6Ui/ZUynwD3N9PKe5Z+RhJF36eM6xdE4PmdeNWc7fBqq6wvdxlyPsykWwOv J/ND1doXxrVt5JfTBGnxG1e+ofO5FqiaY985sqp8= Subject: Re: [PATCH] misc: bcm-vk: unlock on error in bcm_to_h_msg_dequeue() To: Dan Carpenter Cc: Arnd Bergmann , Greg Kroah-Hartman , Olof Johansson , Desmond Yan , 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 09:31:17 -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 On 2021-02-01 4:22 a.m., 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; > } > This is a pretty fatal case if we fail to allocate memory here. Will let Desmond respond if we wanted to keep the mutex locked forever in this case or if we do want to return and keep mutex locked if it is fatal and there is no real recovery path. > /* flush rd pointer after a message is dequeued */