]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
kernel/gcov/fs.c: gcov_seq_next() should increase position index
authorVasily Averin <vvs@virtuozzo.com>
Fri, 10 Apr 2020 21:34:10 +0000 (14:34 -0700)
committerStefan Bader <stefan.bader@canonical.com>
Thu, 14 May 2020 08:54:06 +0000 (10:54 +0200)
BugLink: https://bugs.launchpad.net/bugs/1877461
[ Upstream commit f4d74ef6220c1eda0875da30457bef5c7111ab06 ]

If seq_file .next function does not change position index, read after
some lseek can generate unexpected output.

https://bugzilla.kernel.org/show_bug.cgi?id=206283
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: NeilBrown <neilb@suse.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Waiman Long <longman@redhat.com>
Link: http://lkml.kernel.org/r/f65c6ee7-bd00-f910-2f8a-37cc67e4ff88@virtuozzo.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
kernel/gcov/fs.c

index 6e40ff6be083dab77ad46edc01dbd95e4c0a854f..291e0797125b694334db84869b5db3676531d335 100644 (file)
@@ -109,9 +109,9 @@ static void *gcov_seq_next(struct seq_file *seq, void *data, loff_t *pos)
 {
        struct gcov_iterator *iter = data;
 
+       (*pos)++;
        if (gcov_iter_next(iter))
                return NULL;
-       (*pos)++;
 
        return iter;
 }