From patchwork Mon Mar 25 20:48:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 10870037 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A2CDB922 for ; Mon, 25 Mar 2019 20:51:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8937028CC3 for ; Mon, 25 Mar 2019 20:51:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D57628D0D; Mon, 25 Mar 2019 20:51:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 124A028CC3 for ; Mon, 25 Mar 2019 20:51:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=tTQdHxQ/BoXoSrv7fjqAjICLTktfsYgS9ME/5Fg08Mw=; b=TFD1y+VebUlpInPXdA8ZDkpliV KgQ6DXqNGWnh04zBgado4Y1dfAurU9jg67OE7BOGzJ3q2eGl5Z+bIuF6MPCrL/Nwv+ZsuOSLG6MoU 6CwREdwpLy9u/uDnz9cADFi9j2Yl4RMFaekFgDz6RlS7I6S1/rwkr/o6o4V2YD/S9O6UV0qdRzsh8 ciNYUBM95NXH54A7LaWlAdYl0gwgPGKXc96dVzEF5k4JOCDqtcLLpwCyukfP3gBBprqIov4J5I9qZ ilXZ4UkpI/ABi3HtXUXTreIYrUplJ3mT7SnUO24mOFlUihn5FS53SZINiDzI10AUy9pO/HjbR6gx4 9sAlzXKg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8WYa-0005fE-QC; Mon, 25 Mar 2019 20:50:56 +0000 Received: from mta-p6.oit.umn.edu ([134.84.196.206]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8WYU-0005em-Mn for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2019 20:50:54 +0000 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 5EB81C89 for ; Mon, 25 Mar 2019 20:50:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tEtNvI1OUX99 for ; Mon, 25 Mar 2019 15:50:48 -0500 (CDT) Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 9497B11FE for ; Mon, 25 Mar 2019 15:48:45 -0500 (CDT) Received: by mail-io1-f71.google.com with SMTP id k2so8725381ioj.2 for ; Mon, 25 Mar 2019 13:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G6rKOlRcVDNylxTYpEQra270TlKJZLrSc2YTveB5az8=; b=cNY39yx9PEMb7BsYwZ1VmB6DX1ZImAHBUF/asvcQ01dX+EMU9+YvM3tBJxKJQCgq0l pD8SDSyG12V5it3TDi/gIB8RZgfcoQMoA4aa/CWmP7511reDxj5+eijk80BB7jKZYU8/ vPmJWlO1xwxKHlZsf4tPOEbeyaq5cG+nXVvsrwqTdUXIXLI9yVIjglfVVrT2L/uECbfR vwlgjCMtuyu1IhtKsAyAXByoloftG7vEPvzeNOkER/xgy8WfD0ELoCfCUCwCN3BaJs4V kaprwUlvMvDQAp6J4txL+fxyBp2aglL1JRoWS8f2C6xRwpmEukNsyafdN139jxSXhHqc L5SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G6rKOlRcVDNylxTYpEQra270TlKJZLrSc2YTveB5az8=; b=m+UUrkOdY9Sp7llzD7+fTTN1A7PRsltsBCkmjLlhfj1U0jhuyIXnALtlTPgZwG2fZz VuMPEe1XOS/kNk8RYHv4yp/CMRLYCXcbO1ZnD301iaGSqyLHLiie+BdHGidalRIuaB1K 8ij/y+KsbiYqLXKmOu4GeZ44Cgq0Akv2xv9Mdz6NpReCKKmM5CrEhuZ8NTPhGVYrmAjX 3HNPOUkDRnWkZ+umDy4jo/Gh1RjzsuW488IkY9SIpZso3x0mP25SxCnsFYcEWH8jzjT2 APqzvvpUk/m8y3eSY2NSJqECsXnLlc9VLWDRWb14l9TkoKFMJgi+aCgwdRFDT1c6jGdd sH6Q== X-Gm-Message-State: APjAAAVVKp2Q4CkvjxMNbpk4mHSxUDTacfeOaGBOnqNKbfGkB3Ggsv9S sX+B9RKt24eRIrzW1hKx6l/H6y64iqG/L4435N3H0hVC7PLK7aBshQ+TjDb11VNy15dtoyf+/2Z n5zVfYSrwqi/y/9/kw2miNXmDzjEP+QpE4QN7GT8= X-Received: by 2002:a24:4355:: with SMTP id s82mr11906127itb.176.1553546925233; Mon, 25 Mar 2019 13:48:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwJqlWPVdE/cR7aPNSeOFveRbU7/FH+xX1PlHFaZhoJZlTNemg+w8JKQ5z63Y45Vg+CeXpIBg== X-Received: by 2002:a24:4355:: with SMTP id s82mr11906114itb.176.1553546925031; Mon, 25 Mar 2019 13:48:45 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id k22sm4056921iog.10.2019.03.25.13.48.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 13:48:44 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Subject: [PATCH] firmware: arm_scmi: check return value of idr_find Date: Mon, 25 Mar 2019 15:48:22 -0500 Message-Id: <20190325204823.5428-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <225abd6e-4551-213d-367b-93d938789188@arm.com> References: <225abd6e-4551-213d-367b-93d938789188@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_135050_843270_2B82802C X-CRM114-Status: GOOD ( 13.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sudeep Holla , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, pakki001@umn.edu MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Thanks for Steven Price's review of this patch. In the current code, idr_find won't return NULL because the SCMI_PROTOCOL_BASE id must exist. However, it might return NULL in the future code if the check is on another node while processing the children in subsequent calls to scmi_mbox_chan_setup(). Therefore, the patch conservatively checks the return value and returns -EINVAL when it indeed failed. Signed-off-by: Kangjie Lu Reviewed-by: Steven Price --- drivers/firmware/arm_scmi/driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 8f952f2f1a29..35faa203d549 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -709,6 +709,8 @@ scmi_mbox_chan_setup(struct scmi_info *info, struct device *dev, int prot_id) if (scmi_mailbox_check(np)) { cinfo = idr_find(&info->tx_idr, SCMI_PROTOCOL_BASE); + if (!cinfo) + return -EINVAL; goto idr_alloc; }