lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 071/207] firmware: arm_scmi: Harden accesses to the reset domains
    Date
    From: Cristian Marussi <cristian.marussi@arm.com>

    [ Upstream commit e9076ffbcaed5da6c182b144ef9f6e24554af268 ]

    Accessing reset domains descriptors by the index upon the SCMI drivers
    requests through the SCMI reset operations interface can potentially
    lead to out-of-bound violations if the SCMI driver misbehave.

    Add an internal consistency check before any such domains descriptors
    accesses.

    Link: https://lore.kernel.org/r/20220817172731.1185305-5-cristian.marussi@arm.com
    Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
    Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
    Stable-dep-of: b75c83d9b961 ("firmware: arm_scmi: Fix the asynchronous reset requests")
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/firmware/arm_scmi/reset.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/firmware/arm_scmi/reset.c b/drivers/firmware/arm_scmi/reset.c
    index 673f3eb498f4..b0494165b1cb 100644
    --- a/drivers/firmware/arm_scmi/reset.c
    +++ b/drivers/firmware/arm_scmi/reset.c
    @@ -166,8 +166,12 @@ static int scmi_domain_reset(const struct scmi_protocol_handle *ph, u32 domain,
    struct scmi_xfer *t;
    struct scmi_msg_reset_domain_reset *dom;
    struct scmi_reset_info *pi = ph->get_priv(ph);
    - struct reset_dom_info *rdom = pi->dom_info + domain;
    + struct reset_dom_info *rdom;

    + if (domain >= pi->num_domains)
    + return -EINVAL;
    +
    + rdom = pi->dom_info + domain;
    if (rdom->async_reset)
    flags |= ASYNCHRONOUS_RESET;

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-26 13:47    [W:6.712 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site