| Message ID | 1519389859-14947-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2018/2/23 20:44, Geert Uytterhoeven wrote: > The hs_timing_cfg[] array is indexed using a value derived from the > "mshcN" alias in DT, which may lead to an out-of-bounds access. Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
On 23 February 2018 at 13:44, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > The hs_timing_cfg[] array is indexed using a value derived from the > "mshcN" alias in DT, which may lead to an out-of-bounds access. > > Fix this by adding a range check. > > Fixes: 361c7fe9b02eee7e ("mmc: dw_mmc-k3: add sd support for hi3660") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks, applied for fixes! Should we add a stable tag as well? Kind regards Uffe > --- > v2: > - Fix Fixes reference. > > There is another possible out-of-bounds access in > drivers/mmc/host/dw_mmc.c:dw_mci_init_slot(): > > if (drv_data && drv_data->caps) > mmc->caps |= drv_data->caps[ctrl_id]; > > With ctrl_id derived from "mshcN". > > Unfortunately the upper bound is not known at run-time, without adding > such a field to struct dw_mci_drv_data first. > --- > drivers/mmc/host/dw_mmc-k3.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c > index 73fd75c3c824904d..75ae5803b0db24dd 100644 > --- a/drivers/mmc/host/dw_mmc-k3.c > +++ b/drivers/mmc/host/dw_mmc-k3.c > @@ -135,6 +135,9 @@ static int dw_mci_hi6220_parse_dt(struct dw_mci *host) > if (priv->ctrl_id < 0) > priv->ctrl_id = 0; > > + if (priv->ctrl_id >= TIMING_MODE) > + return -EINVAL; > + > host->priv = priv; > return 0; > } > -- > 2.7.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c index 73fd75c3c824904d..75ae5803b0db24dd 100644 --- a/drivers/mmc/host/dw_mmc-k3.c +++ b/drivers/mmc/host/dw_mmc-k3.c @@ -135,6 +135,9 @@ static int dw_mci_hi6220_parse_dt(struct dw_mci *host) if (priv->ctrl_id < 0) priv->ctrl_id = 0; + if (priv->ctrl_id >= TIMING_MODE) + return -EINVAL; + host->priv = priv; return 0; }
The hs_timing_cfg[] array is indexed using a value derived from the "mshcN" alias in DT, which may lead to an out-of-bounds access. Fix this by adding a range check. Fixes: 361c7fe9b02eee7e ("mmc: dw_mmc-k3: add sd support for hi3660") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v2: - Fix Fixes reference. There is another possible out-of-bounds access in drivers/mmc/host/dw_mmc.c:dw_mci_init_slot(): if (drv_data && drv_data->caps) mmc->caps |= drv_data->caps[ctrl_id]; With ctrl_id derived from "mshcN". Unfortunately the upper bound is not known at run-time, without adding such a field to struct dw_mci_drv_data first. --- drivers/mmc/host/dw_mmc-k3.c | 3 +++ 1 file changed, 3 insertions(+)