From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tycho Andersen Subject: [PATCH 2/6] seccomp: make underlying bpf ref counted as well Date: Fri, 4 Sep 2015 10:04:20 -0600 Message-ID: <1441382664-17437-3-git-send-email-tycho.andersen@canonical.com> References: <1441382664-17437-1-git-send-email-tycho.andersen@canonical.com> Cc: Will Drewry , Oleg Nesterov , Andy Lutomirski , Pavel Emelyanov , "Serge E. Hallyn" , Daniel Borkmann , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Tycho Andersen To: Kees Cook , Alexei Starovoitov Return-path: In-Reply-To: <1441382664-17437-1-git-send-email-tycho.andersen@canonical.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org In the next patch, we're going to add a way to access the underlying filters via bpf fds. This means that we need to ref-count both the struct seccomp_filter objects and the struct bpf_prog objects separately, in case a process dies but a filter is still referred to by another process. Additionally, we mark classic converted seccomp filters as seccomp eBPF programs, since they are a subset of what is supported in seccomp eBPF. Signed-off-by: Tycho Andersen CC: Kees Cook CC: Will Drewry CC: Oleg Nesterov CC: Andy Lutomirski CC: Pavel Emelyanov CC: Serge E. Hallyn CC: Alexei Starovoitov CC: Daniel Borkmann --- kernel/seccomp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 5bd4779..acfe1fb 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -377,6 +377,8 @@ static struct seccomp_filter *seccomp_prepare_filter(struct sock_fprog *fprog) } atomic_set(&sfilter->usage, 1); + atomic_set(&sfilter->prog->aux->refcnt, 1); + sfilter->prog->type = BPF_PROG_TYPE_SECCOMP; return sfilter; } @@ -469,7 +471,7 @@ void get_seccomp_filter(struct task_struct *tsk) static inline void seccomp_filter_free(struct seccomp_filter *filter) { if (filter) { - bpf_prog_free(filter->prog); + bpf_prog_put(filter->prog); kfree(filter); } } -- 2.1.4