mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-24 07:31:41 +00:00
bpf: Fix pos computation for bpf_iter seq_ops->start()
Currently, the pos pointer in bpf iterator map/task/task_file seq_ops->start() is always incremented. This is incorrect. It should be increased only if *pos is 0 (for SEQ_START_TOKEN) since these start() function actually returns the first real object. If *pos is not 0, it merely found the object based on the state in seq->private, and not really advancing the *pos. This patch fixed this issue by only incrementing *pos if it is 0. Note that the old *pos calculation, although not correct, does not affect correctness of bpf_iter as bpf_iter seq_file->read() does not support llseek. This patch also renamed "mid" in bpf_map iterator seq_file private data to "map_id" for better clarity. Fixes:6086d29def
("bpf: Add bpf_map iterator") Fixes:eaaacd2391
("bpf: Add task and task/file iterator targets") Signed-off-by: Yonghong Song <yhs@fb.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Link: https://lore.kernel.org/bpf/20200722195156.4029817-1-yhs@fb.com
This commit is contained in:
parent
86176a1821
commit
3f9969f2c0
2 changed files with 10 additions and 12 deletions
|
@ -51,7 +51,8 @@ static void *task_seq_start(struct seq_file *seq, loff_t *pos)
|
|||
if (!task)
|
||||
return NULL;
|
||||
|
||||
++*pos;
|
||||
if (*pos == 0)
|
||||
++*pos;
|
||||
return task;
|
||||
}
|
||||
|
||||
|
@ -210,7 +211,8 @@ static void *task_file_seq_start(struct seq_file *seq, loff_t *pos)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
++*pos;
|
||||
if (*pos == 0)
|
||||
++*pos;
|
||||
info->task = task;
|
||||
info->files = files;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue