mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
bpf, iter: Fix the condition on p when calling stop.
In bpf_seq_read, seq->op->next() could return an ERR and jump to the label stop. However, the existing code in stop does not handle the case when p (returned from next()) is an ERR. Adds the handling of ERR of p by converting p into an error and jumping to done. Because all the current implementations do not have a case that returns ERR from next(), so this patch doesn't have behavior changes right now. Acked-by: Yonghong Song <yhs@fb.com> Signed-off-by: Hao Luo <haoluo@google.com> Link: https://lore.kernel.org/r/20220805214821.1058337-4-haoluo@google.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
parent
f3a2aebdd6
commit
be3bb83dab
|
@ -197,6 +197,11 @@ static ssize_t bpf_seq_read(struct file *file, char __user *buf, size_t size,
|
|||
}
|
||||
stop:
|
||||
offs = seq->count;
|
||||
if (IS_ERR(p)) {
|
||||
seq->op->stop(seq, NULL);
|
||||
err = PTR_ERR(p);
|
||||
goto done;
|
||||
}
|
||||
/* bpf program called if !p */
|
||||
seq->op->stop(seq, p);
|
||||
if (!p) {
|
||||
|
|
Loading…
Reference in a new issue