| From a62ea1abb3a24bf664b1a41d01827a6e812f6cc3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 12 Jul 2021 15:18:18 +0100 |
| Subject: firmware: arm_scmi: Fix range check for the maximum number of pending |
| messages |
| |
| From: Cristian Marussi <cristian.marussi@arm.com> |
| |
| [ Upstream commit bdb8742dc6f7c599c3d61959234fe4c23638727b ] |
| |
| 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 accordingly the checks performed on the value exported by transports |
| in scmi_desc.max_msg |
| |
| Link: https://lore.kernel.org/r/20210712141833.6628-3-cristian.marussi@arm.com |
| Reported-by: Vincent Guittot <vincent.guittot@linaro.org> |
| Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> |
| [sudeep.holla: updated the patch title and error message] |
| Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 6bff4cceb3c3..c9fda6261c6b 100644 |
| --- a/drivers/firmware/arm_scmi/driver.c |
| +++ b/drivers/firmware/arm_scmi/driver.c |
| @@ -1030,8 +1030,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 maximum messages %d, not in range [1 - %lu]\n", |
| desc->max_msg, MSG_TOKEN_MAX); |
| return -EINVAL; |
| } |
| -- |
| 2.30.2 |
| |
