diff options
| author | Vasily Averin <vvs@virtuozzo.com> | 2020-01-25 12:10:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-24 08:36:58 +0100 |
| commit | 3ce3df5d00d08e0a12acceb8ff7d23fd4c8d1cee (patch) | |
| tree | b1ad381fc237a078c07ff1031cd623be8b27a21f /kernel/bpf | |
| parent | 9a178494d05b4a8c338ce07a0f9ca6f42bc58c58 (diff) | |
| download | linux-stable-3ce3df5d00d08e0a12acceb8ff7d23fd4c8d1cee.tar.gz linux-stable-3ce3df5d00d08e0a12acceb8ff7d23fd4c8d1cee.tar.bz2 linux-stable-3ce3df5d00d08e0a12acceb8ff7d23fd4c8d1cee.zip | |
bpf: map_seq_next should always increase position index
[ Upstream commit 90435a7891a2259b0f74c5a1bc5600d0d64cba8f ]
If seq_file .next fuction does not change position index,
read after some lseek can generate an unexpected output.
See also: https://bugzilla.kernel.org/show_bug.cgi?id=206283
v1 -> v2: removed missed increment in end of function
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/eca84fdd-c374-a154-d874-6c7b55fc3bc4@virtuozzo.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c index a70f7209cda3..218c09ff6a27 100644 --- a/kernel/bpf/inode.c +++ b/kernel/bpf/inode.c @@ -196,6 +196,7 @@ static void *map_seq_next(struct seq_file *m, void *v, loff_t *pos) void *key = map_iter(m)->key; void *prev_key; + (*pos)++; if (map_iter(m)->done) return NULL; @@ -208,8 +209,6 @@ static void *map_seq_next(struct seq_file *m, void *v, loff_t *pos) map_iter(m)->done = true; return NULL; } - - ++(*pos); return key; } |