Messages in this thread Patch in this message | | | Date | Sat, 9 Jul 2022 00:04:34 +0000 | Subject | [PATCH bpf-next v3 3/8] bpf, iter: Fix the condition on p when calling stop. | From | Yosry Ahmed <> |
| |
From: Hao Luo <haoluo@google.com>
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.
Signed-off-by: Hao Luo <haoluo@google.com> Signed-off-by: Yosry Ahmed <yosryahmed@google.com> Acked-by: Yonghong Song <yhs@fb.com> --- kernel/bpf/bpf_iter.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/kernel/bpf/bpf_iter.c b/kernel/bpf/bpf_iter.c index 7e8fd49406f64..4688ba39ef25c 100644 --- a/kernel/bpf/bpf_iter.c +++ b/kernel/bpf/bpf_iter.c @@ -198,6 +198,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) { -- 2.37.0.rc0.161.g10f37bed90-goog
| |