On Sun, Aug 2, 2009 at 10:02 AM, Roel Kluin<roel.kluin@xxxxxxxxx> wrote: > Check whether index is within bounds before testing the element. The change is correct but: - There are other places in the code with that construct. Even though they wouldn't trigger an overflow, why not fixing them too? - Keep the likely: we are more likely to run out of data in the layers than to exhaust the counter (which is why no overflow was ever triggered, I believe ;-) HTH T-Bone > diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c > index f9f9a5f..13a64bc 100644 > --- a/drivers/parisc/pdc_stable.c > +++ b/drivers/parisc/pdc_stable.c > @@ -370,7 +370,7 @@ pdcspath_layer_read(struct pdcspath_entry *entry, char *buf) > if (!i) /* entry is not ready */ > return -ENODATA; > > - for (i = 0; devpath->layers[i] && (likely(i < 6)); i++) > + for (i = 0; i < 6 && devpath->layers[i]; i++) > out += sprintf(out, "%u ", devpath->layers[i]); > > out += sprintf(out, "\n"); > -- > To unsubscribe from this list: send the line "unsubscribe linux-parisc" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- Thibaut VARENE http://www.parisc-linux.org/~varenet/ -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
