From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tycho Andersen Subject: [PATCH v3 5/5] bpf: save the program the user actually supplied Date: Wed, 30 Sep 2015 12:13:40 -0600 Message-ID: <1443636820-17083-6-git-send-email-tycho.andersen@canonical.com> References: <1443636820-17083-1-git-send-email-tycho.andersen@canonical.com> Return-path: In-Reply-To: <1443636820-17083-1-git-send-email-tycho.andersen@canonical.com> Sender: netdev-owner@vger.kernel.org To: Kees Cook , Alexei Starovoitov Cc: Will Drewry , Oleg Nesterov , Andy Lutomirski , Pavel Emelyanov , "Serge E. Hallyn" , Daniel Borkmann , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, Tycho Andersen List-Id: linux-api@vger.kernel.org In some cases (e.g. seccomp) the program result might be translated from the original program the user supplied. If we're saving the result for checkpoint/restore, we should save exactly the program the user initially supplied. This causes problems when the translations seccomp makes are not allowed by bpf_check_classic. 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 --- net/core/filter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index 70995dd..5a4596b 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -845,8 +845,7 @@ int bpf_prog_store_orig_filter(struct bpf_prog *fp, fkprog = fp->orig_prog; fkprog->len = fprog->len; - fkprog->filter = kmemdup(fp->insns, fsize, - GFP_KERNEL | __GFP_NOWARN); + fkprog->filter = memdup_user(fprog->filter, fsize); if (!fkprog->filter) { kfree(fp->orig_prog); return -ENOMEM; -- 2.5.0