From: Cristian Marussi <cristian.marussi@arm.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, virtualization@lists.linux-foundation.org, virtio-dev@lists.oasis-open.org Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com, Jonathan.Cameron@Huawei.com, f.fainelli@gmail.com, etienne.carriere@linaro.org, vincent.guittot@linaro.org, souvik.chakravarty@arm.com, cristian.marussi@arm.com, igor.skalkin@opensynergy.com, peter.hilber@opensynergy.com, alex.bennee@linaro.org, jean-philippe@linaro.org, mikhail.golubev@opensynergy.com, anton.yakovlev@opensynergy.com, Vasyl.Vavrychuk@opensynergy.com, Andriy.Tryshnivskyy@opensynergy.com Subject: [PATCH v6 02/17] firmware: arm_scmi: Fix max pending messages boundary check Date: Mon, 12 Jul 2021 15:18:18 +0100 [thread overview] Message-ID: <20210712141833.6628-3-cristian.marussi@arm.com> (raw) In-Reply-To: <20210712141833.6628-1-cristian.marussi@arm.com> SCMI message headers carry a sequence number and such field is sized to allow for MSG_TOKEN_MAX distinct numbers; moreover zero is not really an acceptable maximum number of pending in-flight messages. Fix accordignly the checks performed on the value exported by transports in scmi_desc.max_msg. Reported-by: Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> --- drivers/firmware/arm_scmi/driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 66e5e694be7d..d2c98642cb14 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -1025,8 +1025,9 @@ static int __scmi_xfer_info_init(struct scmi_info *sinfo, const struct scmi_desc *desc = sinfo->desc; /* Pre-allocated messages, no more than what hdr.seq can support */ - if (WARN_ON(desc->max_msg >= MSG_TOKEN_MAX)) { - dev_err(dev, "Maximum message of %d exceeds supported %ld\n", + if (WARN_ON(!desc->max_msg || desc->max_msg > MSG_TOKEN_MAX)) { + dev_err(dev, + "Invalid max_msg %d. Maximum messages supported %lu.\n", desc->max_msg, MSG_TOKEN_MAX); return -EINVAL; } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Cristian Marussi <cristian.marussi@arm.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, virtualization@lists.linux-foundation.org, virtio-dev@lists.oasis-open.org Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com, Jonathan.Cameron@Huawei.com, f.fainelli@gmail.com, etienne.carriere@linaro.org, vincent.guittot@linaro.org, souvik.chakravarty@arm.com, cristian.marussi@arm.com, igor.skalkin@opensynergy.com, peter.hilber@opensynergy.com, alex.bennee@linaro.org, jean-philippe@linaro.org, mikhail.golubev@opensynergy.com, anton.yakovlev@opensynergy.com, Vasyl.Vavrychuk@opensynergy.com, Andriy.Tryshnivskyy@opensynergy.com Subject: [PATCH v6 02/17] firmware: arm_scmi: Fix max pending messages boundary check Date: Mon, 12 Jul 2021 15:18:18 +0100 [thread overview] Message-ID: <20210712141833.6628-3-cristian.marussi@arm.com> (raw) In-Reply-To: <20210712141833.6628-1-cristian.marussi@arm.com> SCMI message headers carry a sequence number and such field is sized to allow for MSG_TOKEN_MAX distinct numbers; moreover zero is not really an acceptable maximum number of pending in-flight messages. Fix accordignly the checks performed on the value exported by transports in scmi_desc.max_msg. Reported-by: Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> --- drivers/firmware/arm_scmi/driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 66e5e694be7d..d2c98642cb14 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -1025,8 +1025,9 @@ static int __scmi_xfer_info_init(struct scmi_info *sinfo, const struct scmi_desc *desc = sinfo->desc; /* Pre-allocated messages, no more than what hdr.seq can support */ - if (WARN_ON(desc->max_msg >= MSG_TOKEN_MAX)) { - dev_err(dev, "Maximum message of %d exceeds supported %ld\n", + if (WARN_ON(!desc->max_msg || desc->max_msg > MSG_TOKEN_MAX)) { + dev_err(dev, + "Invalid max_msg %d. Maximum messages supported %lu.\n", desc->max_msg, MSG_TOKEN_MAX); return -EINVAL; } -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-07-12 14:19 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-12 14:18 [PATCH v6 00/17] Introduce SCMI transport based on VirtIO Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 01/17] firmware: arm_scmi: Avoid padding in sensor message structure Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi [this message] 2021-07-12 14:18 ` [PATCH v6 02/17] firmware: arm_scmi: Fix max pending messages boundary check Cristian Marussi 2021-07-14 16:46 ` Sudeep Holla 2021-07-14 16:46 ` Sudeep Holla 2021-07-12 14:18 ` [PATCH v6 03/17] firmware: arm_scmi: Add support for type handling in common functions Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 04/17] firmware: arm_scmi: Remove scmi_dump_header_dbg() helper Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 05/17] firmware: arm_scmi: Add transport optional init/exit support Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-28 11:40 ` Sudeep Holla 2021-07-28 11:40 ` Sudeep Holla 2021-07-28 12:28 ` Cristian Marussi 2021-07-28 12:28 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 06/17] firmware: arm_scmi: Introduce monotonically increasing tokens Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-28 14:17 ` Sudeep Holla 2021-07-28 14:17 ` Sudeep Holla 2021-07-28 16:54 ` Cristian Marussi 2021-07-28 16:54 ` [virtio-dev] " Cristian Marussi 2021-07-28 16:54 ` Cristian Marussi 2021-08-02 10:24 ` Sudeep Holla 2021-08-02 10:24 ` Sudeep Holla 2021-08-03 12:52 ` Cristian Marussi 2021-08-03 12:52 ` [virtio-dev] " Cristian Marussi 2021-08-03 12:52 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 07/17] firmware: arm_scmi: Handle concurrent and out-of-order messages Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-15 16:36 ` Peter Hilber 2021-07-15 16:36 ` [virtio-dev] " Peter Hilber 2021-07-15 16:36 ` Peter Hilber 2021-07-19 9:14 ` Cristian Marussi 2021-07-19 9:14 ` Cristian Marussi 2021-07-22 8:32 ` Peter Hilber 2021-07-22 8:32 ` [virtio-dev] " Peter Hilber 2021-07-22 8:32 ` Peter Hilber 2021-07-28 8:31 ` Cristian Marussi 2021-07-28 8:31 ` Cristian Marussi 2021-08-02 10:10 ` Sudeep Holla 2021-08-02 10:10 ` Sudeep Holla 2021-08-02 10:27 ` Cristian Marussi 2021-08-02 10:27 ` [virtio-dev] " Cristian Marussi 2021-08-02 10:27 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 08/17] firmware: arm_scmi: Add priv parameter to scmi_rx_callback Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-28 14:26 ` Sudeep Holla 2021-07-28 14:26 ` Sudeep Holla 2021-07-28 17:25 ` Cristian Marussi 2021-07-28 17:25 ` [virtio-dev] " Cristian Marussi 2021-07-28 17:25 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 09/17] firmware: arm_scmi: Make .clear_channel optional Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 10/17] firmware: arm_scmi: Make polling mode optional Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-15 16:36 ` Peter Hilber 2021-07-15 16:36 ` [virtio-dev] " Peter Hilber 2021-07-15 16:36 ` Peter Hilber 2021-07-19 9:15 ` Cristian Marussi 2021-07-19 9:15 ` Cristian Marussi 2021-07-28 14:34 ` Sudeep Holla 2021-07-28 14:34 ` Sudeep Holla 2021-07-28 17:41 ` Cristian Marussi 2021-07-28 17:41 ` [virtio-dev] " Cristian Marussi 2021-07-28 17:41 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 11/17] firmware: arm_scmi: Make SCMI transports configurable Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-28 14:50 ` Sudeep Holla 2021-07-28 14:50 ` Sudeep Holla 2021-07-29 16:18 ` Cristian Marussi 2021-07-29 16:18 ` [virtio-dev] " Cristian Marussi 2021-07-29 16:18 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 12/17] firmware: arm_scmi: Make shmem support optional for transports Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 13/17] firmware: arm_scmi: Add method to override max message number Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 14/17] firmware: arm_scmi: Add message passing abstractions for transports Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-15 16:36 ` Peter Hilber 2021-07-15 16:36 ` [virtio-dev] " Peter Hilber 2021-07-15 16:36 ` Peter Hilber 2021-07-19 9:16 ` Cristian Marussi 2021-07-19 9:16 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 15/17] firmware: arm_scmi: Add optional link_supplier() transport op Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-28 15:36 ` Sudeep Holla 2021-07-28 15:36 ` Sudeep Holla 2021-07-29 16:19 ` Cristian Marussi 2021-07-29 16:19 ` [virtio-dev] " Cristian Marussi 2021-07-29 16:19 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 16/17] dt-bindings: arm: Add virtio transport for SCMI Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-12 14:18 ` [PATCH v6 17/17] firmware: arm_scmi: Add virtio transport Cristian Marussi 2021-07-12 14:18 ` Cristian Marussi 2021-07-15 16:35 ` [PATCH v6 00/17] Introduce SCMI transport based on VirtIO Peter Hilber 2021-07-15 16:35 ` [virtio-dev] " Peter Hilber 2021-07-15 16:35 ` Peter Hilber 2021-07-19 11:36 ` Cristian Marussi 2021-07-19 11:36 ` Cristian Marussi 2021-07-22 8:30 ` Peter Hilber 2021-07-22 8:30 ` [virtio-dev] " Peter Hilber 2021-07-22 8:30 ` Peter Hilber 2021-08-11 9:31 ` Floris Westermann 2021-08-11 9:31 ` Floris Westermann 2021-08-11 15:26 ` Cristian Marussi 2021-08-11 15:26 ` [virtio-dev] " Cristian Marussi 2021-08-11 15:26 ` Cristian Marussi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210712141833.6628-3-cristian.marussi@arm.com \ --to=cristian.marussi@arm.com \ --cc=Andriy.Tryshnivskyy@opensynergy.com \ --cc=Jonathan.Cameron@Huawei.com \ --cc=Vasyl.Vavrychuk@opensynergy.com \ --cc=alex.bennee@linaro.org \ --cc=anton.yakovlev@opensynergy.com \ --cc=etienne.carriere@linaro.org \ --cc=f.fainelli@gmail.com \ --cc=igor.skalkin@opensynergy.com \ --cc=james.quinlan@broadcom.com \ --cc=jean-philippe@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mikhail.golubev@opensynergy.com \ --cc=peter.hilber@opensynergy.com \ --cc=souvik.chakravarty@arm.com \ --cc=sudeep.holla@arm.com \ --cc=vincent.guittot@linaro.org \ --cc=virtio-dev@lists.oasis-open.org \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.