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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 23200C76188 for ; Fri, 19 Jul 2019 04:20:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E14062082F for ; Fri, 19 Jul 2019 04:20:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563510021; bh=RGRHkax0X2h+aBGdjq5vtEw/ydfjMFrM6xCJLzFw5sI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gwoeFfiFesyPhBMNNfFWS2EPmreB9PYLcs5fGDonvPPlyCkxXBmnbshhkt55ybWzg VT+BrniMqYOhtZUBiAGBJApCVEYAqTDCxE4+HTP9j4HyrNIZxYs8ZQsxRE+MWjYpkl sCRQ6gjzJx7LRdNzOMg5bY7U2xPXrNh9vE6SeO2Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387461AbfGSEUT (ORCPT ); Fri, 19 Jul 2019 00:20:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:48262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388949AbfGSEMp (ORCPT ); Fri, 19 Jul 2019 00:12:45 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 17613218DA; Fri, 19 Jul 2019 04:12:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509564; bh=RGRHkax0X2h+aBGdjq5vtEw/ydfjMFrM6xCJLzFw5sI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aQmgYU9kTnHYh3CJQ6ImQaZ3ji3olnhW0fzq1saNcWP1Oaix/rk/74w8992jwMWP3 wpRunzm3FZPOhjsBMaDIsPT4RvXqDe4QKUZDjhoWEJAfecQ1O+7FiYx4QnpG12TsiT i7H348xOTIuSbpbxhU7Uh482sYqzIWvJBXbcyFCA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: morten petersen , Jassi Brar , Sasha Levin Subject: [PATCH AUTOSEL 4.14 50/60] mailbox: handle failed named mailbox channel request Date: Fri, 19 Jul 2019 00:10:59 -0400 Message-Id: <20190719041109.18262-50-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719041109.18262-1-sashal@kernel.org> References: <20190719041109.18262-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: morten petersen [ Upstream commit 25777e5784a7b417967460d4fcf9660d05a0c320 ] Previously, if mbox_request_channel_byname was used with a name which did not exist in the "mbox-names" property of a mailbox client, the mailbox corresponding to the last entry in the "mbox-names" list would be incorrectly selected. With this patch, -EINVAL is returned if the named mailbox is not found. Signed-off-by: Morten Borup Petersen Signed-off-by: Jassi Brar Signed-off-by: Sasha Levin --- drivers/mailbox/mailbox.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 537f4f6d009b..44b49a2676f0 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -391,11 +391,13 @@ struct mbox_chan *mbox_request_channel_byname(struct mbox_client *cl, of_property_for_each_string(np, "mbox-names", prop, mbox_name) { if (!strncmp(name, mbox_name, strlen(name))) - break; + return mbox_request_channel(cl, index); index++; } - return mbox_request_channel(cl, index); + dev_err(cl->dev, "%s() could not locate channel named \"%s\"\n", + __func__, name); + return ERR_PTR(-EINVAL); } EXPORT_SYMBOL_GPL(mbox_request_channel_byname); -- 2.20.1