summaryrefslogtreecommitdiff
path: root/kernel/bpf
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-27 15:43:10 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-27 15:43:10 -0400
commitc0cc53162a0644dd57dce5e2fbb9bbafdc57d183 (patch)
tree02393c85628c6ec7d0d942e880623b7f37cf3460 /kernel/bpf
parent8c14586fc320acfed8a0048eb21d1f2e2856fc36 (diff)
parentf28f20da704d399fb1e4d8838ffd697a357d9cc8 (diff)
downloadlinux-sh-c0cc53162a0644dd57dce5e2fbb9bbafdc57d183.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in the conflicts. In the macsec case, the change of the default ID macro name overlapped with the 64-bit netlink attribute alignment fixes in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf')
-rw-r--r--kernel/bpf/verifier.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 6345623d6b02..56f18068b52b 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -2092,7 +2092,6 @@ static int replace_map_fd_with_map_ptr(struct verifier_env *env)
if (IS_ERR(map)) {
verbose("fd %d is not pointing to valid bpf_map\n",
insn->imm);
- fdput(f);
return PTR_ERR(map);
}