From: He Fengqing <hefengqing@huawei.com>
To: <ast@kernel.org>, <daniel@iogearbox.net>, <andrii@kernel.org>,
<kafai@fb.com>, <songliubraving@fb.com>, <yhs@fb.com>,
<john.fastabend@gmail.com>, <kpsingh@kernel.org>
Cc: <davem@davemloft.net>, <kuba@kernel.org>,
<netdev@vger.kernel.org>, <bpf@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [bpf-next 1/3] bpf: Move bpf_prog_clone_free into filter.h file
Date: Wed, 7 Jul 2021 04:38:09 +0000 [thread overview]
Message-ID: <20210707043811.5349-2-hefengqing@huawei.com> (raw)
In-Reply-To: <20210707043811.5349-1-hefengqing@huawei.com>
Move bpf_prog_clone_free function into filter.h, so we can use
it in other file.
Signed-off-by: He Fengqing <hefengqing@huawei.com>
---
include/linux/filter.h | 15 +++++++++++++++
kernel/bpf/core.c | 20 +-------------------
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 472f97074da0..f39e008a377d 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -884,6 +884,21 @@ struct bpf_prog *bpf_prog_realloc(struct bpf_prog *fp_old, unsigned int size,
gfp_t gfp_extra_flags);
void __bpf_prog_free(struct bpf_prog *fp);
+static inline void bpf_prog_clone_free(struct bpf_prog *fp)
+{
+ /* aux was stolen by the other clone, so we cannot free
+ * it from this path! It will be freed eventually by the
+ * other program on release.
+ *
+ * At this point, we don't need a deferred release since
+ * clone is guaranteed to not be locked.
+ */
+ fp->aux = NULL;
+ fp->stats = NULL;
+ fp->active = NULL;
+ __bpf_prog_free(fp);
+}
+
static inline void bpf_prog_unlock_free(struct bpf_prog *fp)
{
__bpf_prog_free(fp);
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 034ad93a1ad7..49b0311f48c1 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -238,10 +238,7 @@ struct bpf_prog *bpf_prog_realloc(struct bpf_prog *fp_old, unsigned int size,
/* We keep fp->aux from fp_old around in the new
* reallocated structure.
*/
- fp_old->aux = NULL;
- fp_old->stats = NULL;
- fp_old->active = NULL;
- __bpf_prog_free(fp_old);
+ bpf_prog_clone_free(fp_old);
}
return fp;
@@ -1102,21 +1099,6 @@ static struct bpf_prog *bpf_prog_clone_create(struct bpf_prog *fp_other,
return fp;
}
-static void bpf_prog_clone_free(struct bpf_prog *fp)
-{
- /* aux was stolen by the other clone, so we cannot free
- * it from this path! It will be freed eventually by the
- * other program on release.
- *
- * At this point, we don't need a deferred release since
- * clone is guaranteed to not be locked.
- */
- fp->aux = NULL;
- fp->stats = NULL;
- fp->active = NULL;
- __bpf_prog_free(fp);
-}
-
void bpf_jit_prog_release_other(struct bpf_prog *fp, struct bpf_prog *fp_other)
{
/* We have to repoint aux->prog to self, as we don't
--
2.25.1
next prev parent reply other threads:[~2021-07-07 3:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-07 4:38 [bpf-next 0/3] potential memleak and use after free in bpf verifier He Fengqing
2021-07-07 4:38 ` He Fengqing [this message]
2021-07-07 7:02 ` [bpf-next 1/3] bpf: Move bpf_prog_clone_free into filter.h file Song Liu
2021-07-07 4:38 ` [bpf-next 2/3] bpf: Fix a memory leak in an error handling path in 'bpf_patch_insn_data()' He Fengqing
2021-07-07 4:38 ` [bpf-next 3/3] bpf: Fix a use after free in bpf_check() He Fengqing
2021-07-07 7:25 ` Song Liu
2021-07-08 3:00 ` He Fengqing
2021-07-08 3:09 ` Alexei Starovoitov
2021-07-09 11:11 ` He Fengqing
2021-07-09 15:12 ` Alexei Starovoitov
2021-07-12 2:17 ` He Fengqing
2021-07-13 23:17 ` Alexei Starovoitov
2021-07-14 1:53 ` He Fengqing
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210707043811.5349-2-hefengqing@huawei.com \
--to=hefengqing@huawei.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox