From patchwork Tue Jul 18 18:39:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 122205 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1961516vqt; Tue, 18 Jul 2023 12:27:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlF/PCoIYrfvGwenBcNMTRnU4s+AklHSek4npdDMgCz84kIFfwFb/Xby+CYMBJ1JFfw5adoR X-Received: by 2002:a05:6a20:10c:b0:133:656e:fe1e with SMTP id 12-20020a056a20010c00b00133656efe1emr165460pzr.47.1689708422650; Tue, 18 Jul 2023 12:27:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689708422; cv=none; d=google.com; s=arc-20160816; b=nuk3OHzXxvWeJlCD2gK5NRmuCCu+WCxpZoLBFlrI2iz3PRnwdte9kkZ1tj2YN/9wo7 fdz0s1T+Zcu+XxXlDN0WkbYzyEizUXedXdCP0yIyMal8J6wK0zJlazJAoNKCAn2XmEWj 4UBEFjAOsztvWm8w9ZXE5sDkNbdisJZSi0oB13VDmDO9wApKVno7MptbwA6qeM3jUZas sCjvbOcFBD73yYycNDjYjKHIKHaNgWo6hWPfaybQxsGTrXwjzZvs5EGZ6iYBhdcp1upi RtNCz89/4gd0yAhsJMD9gZpyXE2gAPWCggvYLWgD1OD6fyUfdaAef81qGRiSdH4vGG8o urQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Jkb55HhAbN5nQxp124JO5CgyYp5FwsBzn/8eguMNO/I=; fh=yb2lMljvABaq9rYojpYe706yWqHq4Urtbnt6pkZIAS4=; b=Fel13bYvV06mDxxy0L2wW5cA4djJH7538fPzWjYO4iU7esniiA2UL7MIKRNM4CVS4x /dnCOkoXHb+3GqasIC4n7W7NWrcwQEaopDJ030x8uYGcKCFxr0ygp6NjRbit1J/p2ega pkEkbGk9b5tg8noJ2vVbY9mbI28qTVovuINYTwxng70Yg8/MrDkBx3DLvBlQYmKL3L+S xY0nXTDuZwTiq9lJhmROVljWcLDHTiGR4SQFghehkR/MPzn5V2oSSLagWww3wJULgiCm zRwdJIqrRCuc4YjWEGUlOl+J8vGqEJ6M1o9YHSMoNZxrIdeaXtg3eOJrximTDAuYr8hv awcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vo5NZKlb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bw14-20020a056a00408e00b00645e8c9e27esi1941323pfb.386.2023.07.18.12.26.45; Tue, 18 Jul 2023 12:27:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vo5NZKlb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230292AbjGRSj1 (ORCPT + 99 others); Tue, 18 Jul 2023 14:39:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230249AbjGRSjY (ORCPT ); Tue, 18 Jul 2023 14:39:24 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74C9AF0 for ; Tue, 18 Jul 2023 11:39:23 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-51cff235226so10907a12.0 for ; Tue, 18 Jul 2023 11:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689705562; x=1692297562; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Jkb55HhAbN5nQxp124JO5CgyYp5FwsBzn/8eguMNO/I=; b=vo5NZKlbXQn4Jl6b8UAEOHnqb04wgASw6MkQZM+pF3hTs01Y0VzlGrVz8NYsDNXcPB smn7BGtYuxNMkXvFUouYasWjGuNLoRZjcMnan244Wbya7Mzsfc8ItrplIUBL9Mhkspac 9Oo1r54niZZC+ITU302GiMZGUvwaQbse/RPw4WsdMWIqh0Ke2HBBkygdlSZ33ijXXcBk OBiDSbdTvbmiQJpm56qq778Q6ijwlCTqPeTqJo8SkVFZzP+x3UdrAOL3UkAHgsKyYmVx CKo9yr9BEhDiUQVXbOmQrphU1dat7sTEJ5uf+Uqe4hldnVEj+0c+moHnjXglHo7uUeSF oYMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689705562; x=1692297562; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Jkb55HhAbN5nQxp124JO5CgyYp5FwsBzn/8eguMNO/I=; b=G9HOeENiYDUH8UPcJcmWG2w+/avjnk24Y9se+tRH0JK1WQfg7VJaODb69J8WPz4syG tH2kWIBSQkg+ttwdOMrObVAxDdZ4ASokZhJmEWHFIU/0oxO51zmwTywzIbycr4ngl9bK P5bbgh4aO0UDGI5uPu3HqB3dZ1CkxXVBEYX0kRnZMlP4gVvZaoPk+grZWdFPZJQ7RiTC t91sCzQ/cqhJZsvodfzyB8HcRbhSkznERnQYMZ/pu9xdIOQmQx8ST9CqTXTl7PVxRGGv oR0bV01/OC0siXvpiazVB+2hUN32ITyT/VnARfnG69W/3Qij1q2KB+gcvwMLTX7K1Eqz Hv2g== X-Gm-Message-State: ABy/qLbf1Gm1rQtFv+eO/SlDBs0ihxZ4Xs1q8CaXGKQlDsxAqMHzYoJQ jtNrzXfbBwBNqz1dcQg87KtPig== X-Received: by 2002:a05:6402:40c5:b0:51e:588b:20ca with SMTP id z5-20020a05640240c500b0051e588b20camr1010538edb.8.1689705561993; Tue, 18 Jul 2023 11:39:21 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.104]) by smtp.gmail.com with ESMTPSA id c19-20020aa7c993000000b0051e1a4454b2sm1564460edt.67.2023.07.18.11.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 11:39:21 -0700 (PDT) From: Krzysztof Kozlowski To: Sudeep Holla , Cristian Marussi , Florian Fainelli , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , stable@vger.kernel.org Subject: [PATCH] firmware: arm_scmi: drop OF node reference in smc_chan_setup Date: Tue, 18 Jul 2023 20:39:16 +0200 Message-Id: <20230718183916.44439-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771787698532918408 X-GMAIL-MSGID: 1771787698532918408 The OF node reference obtained from of_parse_phandle() should be dropped if node is not compatible with arm,scmi-shmem. Fixes: 507cd4d2c5eb ("firmware: arm_scmi: Add compatibility checks for shmem node") Cc: Signed-off-by: Krzysztof Kozlowski --- drivers/firmware/arm_scmi/smc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c index 621c37efe3ec..2d8c510fbf52 100644 --- a/drivers/firmware/arm_scmi/smc.c +++ b/drivers/firmware/arm_scmi/smc.c @@ -137,8 +137,10 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, return -ENOMEM; np = of_parse_phandle(cdev->of_node, "shmem", 0); - if (!of_device_is_compatible(np, "arm,scmi-shmem")) + if (!of_device_is_compatible(np, "arm,scmi-shmem")) { + of_node_put(np); return -ENXIO; + } ret = of_address_to_resource(np, 0, &res); of_node_put(np);