From patchwork Wed Jul 19 06:16:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 122417 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2248395vqt; Wed, 19 Jul 2023 00:01:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlGTLd4YwczQQOs29uCxNDKfdS+agZY+OMjPGJrExFxV7G+UGO+wdXYAlinuIIvhvFrnJ14g X-Received: by 2002:aa7:88c8:0:b0:66a:2ff1:dee2 with SMTP id k8-20020aa788c8000000b0066a2ff1dee2mr4761690pff.10.1689750113750; Wed, 19 Jul 2023 00:01:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689750113; cv=none; d=google.com; s=arc-20160816; b=XifIjRua8M3wsTdJkXTpy3LvtiygsskccWUC83qBMtUWlar4utOqwC/WIet4EIz1cq K9yalUDDP3ZLMLYaB9g2YvBv2mJMLTqhDZG/JiEhml7BKSh3tFp3pWEO7uszEi04L5U3 Xt9An2NLghVl2xkWo5t49azd5pxRgaUBiTh2xwXdx3efL+kWVP6NuLWtoabk033bDJLR tnvbQMyQcyNlI+G21OaGtd+oUt74sM3yPSjJqTs+OAigGDE/3qoCuVJyzrftzPD2qvL4 xhFsiDqV1Xe0fJxKnhNDMV9aJzG0pItPxmsIaoFJEZljp55DmTNO6TM5eoAssAcIjzwH 9Vuw== 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=/3D3opjX717GgTUWBiU+QHvEZYFXmjd+9qv4cSuPkuA=; fh=yb2lMljvABaq9rYojpYe706yWqHq4Urtbnt6pkZIAS4=; b=ZezAsUMZHBedh+PAjW9c9NF8J3tp8CzVfTHUaI0gKdcDswYi8P7z8gn1M5fzkLuQVU 3Xit/rVVTZ0a5syBTnBqA/OcfwjUIQZrDYJCXitLW6yfnVcj7mqy9u73U6R1/PT/ZkO+ gjJna9uQFrnEhKw/mYjLRV8A/XH79R4/cGe42/HL+ARwoycrp65SQHnUFI7mtBeShCYD hU4jVMK+YIq/TYK3WSZp95GwizqB7mklM3JFK8hX5Ioc/7DgtapUR8BFZrlAwNg2Nm5K +Q9QRr23J6xPBXC/dS/9b0VhXvP/MRCjhqBSIpxhhQGSKQEtIV3KLch605j8ggrQxPPa CTrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fmSOGHZS; 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 cg9-20020a056a00290900b00665e0165510si2933389pfb.252.2023.07.19.00.01.40; Wed, 19 Jul 2023 00:01:53 -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=fmSOGHZS; 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 S230520AbjGSGRU (ORCPT + 99 others); Wed, 19 Jul 2023 02:17:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230187AbjGSGRO (ORCPT ); Wed, 19 Jul 2023 02:17:14 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FD051BFF for ; Tue, 18 Jul 2023 23:16:59 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-51e56749750so8884481a12.0 for ; Tue, 18 Jul 2023 23:16:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689747417; x=1692339417; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/3D3opjX717GgTUWBiU+QHvEZYFXmjd+9qv4cSuPkuA=; b=fmSOGHZSbHFsabRaN28Z7YjPrEHukqwNbn/mICX7gQ4RZ8tGRUjDs7n8zF05HOiOpT 7GsUHsd43WCALy5vq9f9JHqv9Mgp1IUjThZkb0NVtGarbXty4p3J0ygLvOzw0m+HJxIF Yc3OpMExpMeGRddyFjaj92TlieU9oGkcRv6WpUzmqfvtLKzxfkPq39F2ZoRbanBHEM/z 3f4OD37fwnbdM1rINn8mRU2c/uCmTbc5iVmZ20/RZqi98lat+QcIB6DRxZ1HV8R/nTi5 UlWhTvsbl5okc+Igl3YJGfiI+Y6RSmH0VzEAyKGsO+abEUB88Uvbm5fJwPpBIVSkBBX6 /Swg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689747417; x=1692339417; 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=/3D3opjX717GgTUWBiU+QHvEZYFXmjd+9qv4cSuPkuA=; b=FR3MFgVbw4GqGmtXZ4ppow7f9RuMMPTlJjC8V9JHIvV4XENZcAsYCpIXi7X5zg8Pp0 +aVSsz0Q4/VgdFZ/8tvQlN4XI1B2yUt+voyRDAT1OLlJcRGjUr4dMkHQfovk0ONqSKL2 EwxgOn1Gw5h0HIjiZYVkS6FfyR6NPbE8jtS8xzuQXdBVq11FpHMt56ZMhfEhCV6Yni3K uDPcHITP+M6AEb5UN6wyJ9j4SOeqpJz0ozze7daB+PnX96LcyIisKsHo4XQmbt45pGeW toSTc+DOuX5sXLQypEBUucQ3TMdrlhrp2rk9D8R26fA8RLT22Qpuj/jHSjRw5FRaUlLx 6vUQ== X-Gm-Message-State: ABy/qLZ8F8F2Cu9Pou08TV5pzKzbEdQ4bMuC231FOtOubkIW4PG6e+q5 FESZXk/XUu5ywK5E9ZDcfcogGw== X-Received: by 2002:a17:906:7698:b0:986:f586:b97 with SMTP id o24-20020a170906769800b00986f5860b97mr1778494ejm.59.1689747417591; Tue, 18 Jul 2023 23:16:57 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.104]) by smtp.gmail.com with ESMTPSA id w24-20020a17090633d800b009935aba3a9dsm1864576eja.48.2023.07.18.23.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 23:16:57 -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 v2] firmware: arm_scmi: drop OF node reference in setup Date: Wed, 19 Jul 2023 08:16:52 +0200 Message-Id: <20230719061652.8850-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: 1771831415073954557 X-GMAIL-MSGID: 1771831415073954557 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 Reviewed-by: Cristian Marussi --- Changes in v2: 1. Correct also mailbox.c --- drivers/firmware/arm_scmi/mailbox.c | 4 +++- drivers/firmware/arm_scmi/smc.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_scmi/mailbox.c b/drivers/firmware/arm_scmi/mailbox.c index 1efa5e9392c4..19246ed1f01f 100644 --- a/drivers/firmware/arm_scmi/mailbox.c +++ b/drivers/firmware/arm_scmi/mailbox.c @@ -166,8 +166,10 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, return -ENOMEM; shmem = of_parse_phandle(cdev->of_node, "shmem", idx); - if (!of_device_is_compatible(shmem, "arm,scmi-shmem")) + if (!of_device_is_compatible(shmem, "arm,scmi-shmem")) { + of_node_put(shmem); return -ENXIO; + } ret = of_address_to_resource(shmem, 0, &res); of_node_put(shmem); 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);