lkml.org 
[lkml]   [2021]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 13/17] firmware: arm_scmi: Fix range check for the maximum number of pending messages
    Date
    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 c396b1d9a3b7..49f4fe575605 100644
    --- a/drivers/firmware/arm_scmi/driver.c
    +++ b/drivers/firmware/arm_scmi/driver.c
    @@ -611,8 +611,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
    \
     
     \ /
      Last update: 2021-07-23 06:00    [W:6.136 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site