| Message ID | 20170622154142.22481-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Colin, I'm preparing a v2 for the initial patchset introducing spi-stm32, if you agree, I can directly add your fix. Regards, Amelie On 06/22/2017 05:41 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently the check for range limits on div is incorrect and will > never return -EINVAL. Fix this by replacing && with || > > Detected by CoverityScan, CID#1446580 ("Structurally dead code") > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/spi/spi-stm32.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c > index 0553f61ab3b7..b75909e7b117 100644 > --- a/drivers/spi/spi-stm32.c > +++ b/drivers/spi/spi-stm32.c > @@ -262,7 +262,7 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz) > * no need to check it there. > * However, we need to ensure the following calculations. > */ > - if ((div < SPI_MBR_DIV_MIN) && > + if ((div < SPI_MBR_DIV_MIN) || > (div > SPI_MBR_DIV_MAX)) > return -EINVAL; > > -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 22/06/17 16:49, Amelie DELAUNAY wrote: > Hi Colin, > > I'm preparing a v2 for the initial patchset introducing spi-stm32, if > you agree, I can directly add your fix. Yep, please do, sounds like a plan. Colin > > Regards, > Amelie > > On 06/22/2017 05:41 PM, Colin King wrote: >> From: Colin Ian King <colin.king@canonical.com> >> >> Currently the check for range limits on div is incorrect and will >> never return -EINVAL. Fix this by replacing && with || >> >> Detected by CoverityScan, CID#1446580 ("Structurally dead code") >> >> Signed-off-by: Colin Ian King <colin.king@canonical.com> >> --- >> drivers/spi/spi-stm32.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c >> index 0553f61ab3b7..b75909e7b117 100644 >> --- a/drivers/spi/spi-stm32.c >> +++ b/drivers/spi/spi-stm32.c >> @@ -262,7 +262,7 @@ static int stm32_spi_prepare_mbr(struct stm32_spi >> *spi, u32 speed_hz) >> * no need to check it there. >> * However, we need to ensure the following calculations. >> */ >> - if ((div < SPI_MBR_DIV_MIN) && >> + if ((div < SPI_MBR_DIV_MIN) || >> (div > SPI_MBR_DIV_MAX)) >> return -EINVAL; >> -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jun 22, 2017 at 05:49:10PM +0200, Amelie DELAUNAY wrote: > I'm preparing a v2 for the initial patchset introducing spi-stm32, if you > agree, I can directly add your fix. Please don't resubmit patches that have already been applied, you should submit patches against current code in the tree you're expecting things to be applied to. If any updates are needed to a patch that's already been applied you should submit incremental patches which make those updates. This avoids having to change published git commits which could cause problems for people working against git. Please don't top post, reply in line with needed context. This allows readers to readily follow the flow of conversation and understand what you are talking about and also helps ensure that everything in the discussion is being addressed.
On 06/22/2017 05:41 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently the check for range limits on div is incorrect and will > never return -EINVAL. Fix this by replacing && with || > > Detected by CoverityScan, CID#1446580 ("Structurally dead code") > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/spi/spi-stm32.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c > index 0553f61ab3b7..b75909e7b117 100644 > --- a/drivers/spi/spi-stm32.c > +++ b/drivers/spi/spi-stm32.c > @@ -262,7 +262,7 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz) > * no need to check it there. > * However, we need to ensure the following calculations. > */ > - if ((div < SPI_MBR_DIV_MIN) && > + if ((div < SPI_MBR_DIV_MIN) || > (div > SPI_MBR_DIV_MAX)) > return -EINVAL; > > Reviewed-by: Amelie Delaunay <amelie.delaunay@st.com> -- To unsubscribe from this list: send the line "unsubscribe linux-spi" 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/spi/spi-stm32.c b/drivers/spi/spi-stm32.c index 0553f61ab3b7..b75909e7b117 100644 --- a/drivers/spi/spi-stm32.c +++ b/drivers/spi/spi-stm32.c @@ -262,7 +262,7 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz) * no need to check it there. * However, we need to ensure the following calculations. */ - if ((div < SPI_MBR_DIV_MIN) && + if ((div < SPI_MBR_DIV_MIN) || (div > SPI_MBR_DIV_MAX)) return -EINVAL;