lkml.org 
[lkml]   [2016]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC v3 12/22] bpf: Cosmetic change for bpf_prog_attach()
    Date
    Move code outside a switch/case to ease code factoring (cf. next
    commit).

    This apply on Daniel Mack's "Add eBPF hooks for cgroups":
    https://lkml.kernel.org/r/1473696735-11269-1-git-send-email-daniel@zonque.org

    Signed-off-by: Mickaël Salaün <mic@digikod.net>
    Cc: Alexei Starovoitov <ast@kernel.org>
    Cc: Daniel Borkmann <daniel@iogearbox.net>
    Cc: Daniel Mack <daniel@zonque.org>
    ---
    kernel/bpf/syscall.c | 23 ++++++++++++-----------
    1 file changed, 12 insertions(+), 11 deletions(-)

    diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
    index f22e3b63d253..45a91d511119 100644
    --- a/kernel/bpf/syscall.c
    +++ b/kernel/bpf/syscall.c
    @@ -843,23 +843,24 @@ static int bpf_prog_attach(const union bpf_attr *attr)
    case BPF_CGROUP_INET_EGRESS:
    prog = bpf_prog_get_type(attr->attach_bpf_fd,
    BPF_PROG_TYPE_CGROUP_SOCKET);
    - if (IS_ERR(prog))
    - return PTR_ERR(prog);
    -
    - cgrp = cgroup_get_from_fd(attr->target_fd);
    - if (IS_ERR(cgrp)) {
    - bpf_prog_put(prog);
    - return PTR_ERR(cgrp);
    - }
    -
    - cgroup_bpf_update(cgrp, prog, attr->attach_type);
    - cgroup_put(cgrp);
    break;

    default:
    return -EINVAL;
    }

    + if (IS_ERR(prog))
    + return PTR_ERR(prog);
    +
    + cgrp = cgroup_get_from_fd(attr->target_fd);
    + if (IS_ERR(cgrp)) {
    + bpf_prog_put(prog);
    + return PTR_ERR(cgrp);
    + }
    +
    + cgroup_bpf_update(cgrp, prog, attr->attach_type);
    + cgroup_put(cgrp);
    +
    return 0;
    }

    --
    2.9.3
    \
     
     \ /
      Last update: 2016-09-17 09:59    [W:4.216 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site