| From aebcab788f4657fea5274b0f24d71ff6d381da02 Mon Sep 17 00:00:00 2001 |
| From: Vasily Averin <vvs@virtuozzo.com> |
| Date: Fri, 24 Jan 2020 08:48:55 +0300 |
| Subject: [PATCH] s390/cio: cio_ignore_proc_seq_next should increase position |
| index |
| |
| commit 8b101a5e14f2161869636ff9cb4907b7749dc0c2 upstream. |
| |
| if seq_file .next fuction does not change position index, |
| read after some lseek can generate unexpected output. |
| |
| Link: https://bugzilla.kernel.org/show_bug.cgi?id=206283 |
| Link: https://lore.kernel.org/r/d44c53a7-9bc1-15c7-6d4a-0c10cb9dffce@virtuozzo.com |
| Reviewed-by: Cornelia Huck <cohuck@redhat.com> |
| Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> |
| Signed-off-by: Vasily Averin <vvs@virtuozzo.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c |
| index 2a3f874a21d5..9cebff8e8d74 100644 |
| --- a/drivers/s390/cio/blacklist.c |
| +++ b/drivers/s390/cio/blacklist.c |
| @@ -303,8 +303,10 @@ static void * |
| cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset) |
| { |
| struct ccwdev_iter *iter; |
| + loff_t p = *offset; |
| |
| - if (*offset >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1)) |
| + (*offset)++; |
| + if (p >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1)) |
| return NULL; |
| iter = it; |
| if (iter->devno == __MAX_SUBCHANNEL) { |
| @@ -314,7 +316,6 @@ cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset) |
| return NULL; |
| } else |
| iter->devno++; |
| - (*offset)++; |
| return iter; |
| } |
| |
| -- |
| 2.7.4 |
| |
