OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35c9bcb
)
bpf: map_seq_next should always increase position index
author
Vasily Averin
<vvs@virtuozzo.com>
Sat, 25 Jan 2020 09:10:02 +0000
(12:10 +0300)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 24 Feb 2020 07:34:51 +0000
(08:34 +0100)
[ 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>
kernel/bpf/inode.c
patch
|
blob
|
history
diff --git
a/kernel/bpf/inode.c
b/kernel/bpf/inode.c
index
dc9d7ac
..
c04815b
100644
(file)
--- a/
kernel/bpf/inode.c
+++ b/
kernel/bpf/inode.c
@@
-198,6
+198,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;
@@
-210,8
+211,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;
}