From 3a9f9183bdd341a25c7805d96bbd78a31d559381 Mon Sep 17 00:00:00 2001 From: Ameen Ali Date: Tue, 24 Feb 2015 18:41:50 +0200 Subject: s390/dcss: array index 'i' is used before limits check. Avoid out-of-bounds-read by checking count before indexing. Signed-off-by : Ameen Ali Reviewed-by: Kees Cook Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- drivers/s390/block/dcssblk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/s390/block/dcssblk.c') diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 96128cb009f3..da212813f2d5 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c @@ -547,7 +547,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char * parse input */ num_of_segments = 0; - for (i = 0; ((buf[i] != '\0') && (buf[i] != '\n') && i < count); i++) { + for (i = 0; (i < count && (buf[i] != '\0') && (buf[i] != '\n')); i++) { for (j = i; (buf[j] != ':') && (buf[j] != '\0') && (buf[j] != '\n') && -- cgit v1.2.3-59-g8ed1b