lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 075/229] wifi: rtl8xxxu: tighten bounds checking in rtl8xxxu_read_efuse()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 620d5eaeb9059636864bda83ca1c68c20ede34a5 ]

    There some bounds checking to ensure that "map_addr" is not out of
    bounds before the start of the loop. But the checking needs to be
    done as we iterate through the loop because "map_addr" gets larger as
    we iterate.

    Fixes: 26f1fad29ad9 ("New driver: rtl8xxxu (mac80211)")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Jes Sorensen <Jes.Sorensen@gmail.com>
    Signed-off-by: Kalle Valo <kvalo@kernel.org>
    Link: https://lore.kernel.org/r/Yv8eGLdBslLAk3Ct@kili
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
    index b80cff96dea1..dd345ed1a717 100644
    --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
    +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
    @@ -1879,13 +1879,6 @@ static int rtl8xxxu_read_efuse(struct rtl8xxxu_priv *priv)

    /* We have 8 bits to indicate validity */
    map_addr = offset * 8;
    - if (map_addr >= EFUSE_MAP_LEN) {
    - dev_warn(dev, "%s: Illegal map_addr (%04x), "
    - "efuse corrupt!\n",
    - __func__, map_addr);
    - ret = -EINVAL;
    - goto exit;
    - }
    for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
    /* Check word enable condition in the section */
    if (word_mask & BIT(i)) {
    @@ -1896,6 +1889,13 @@ static int rtl8xxxu_read_efuse(struct rtl8xxxu_priv *priv)
    ret = rtl8xxxu_read_efuse8(priv, efuse_addr++, &val8);
    if (ret)
    goto exit;
    + if (map_addr >= EFUSE_MAP_LEN - 1) {
    + dev_warn(dev, "%s: Illegal map_addr (%04x), "
    + "efuse corrupt!\n",
    + __func__, map_addr);
    + ret = -EINVAL;
    + goto exit;
    + }
    priv->efuse_wifi.raw[map_addr++] = val8;

    ret = rtl8xxxu_read_efuse8(priv, efuse_addr++, &val8);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 14:59    [W:2.766 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site