iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: minor cleanups in helpers

Browse Source 
Some minor misc cleanups, f.e. use sizeof(__u32) instead of hardcoding
and in __bpf_skb_max_len(), I missed that we always have skb->dev valid
anyway, so we can drop the unneeded test for dev; also few more other
misc bits addressed here.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2016-09-09 02:45:28 +02:00 committed by David S. Miller
parent bf8d85d4f9
commit 6088b5823b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/bpf/helpers.c
View File

@ -126,7 +126,7 @@ static u64 bpf_get_current_pid_tgid(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)
{ {
struct task_struct *task = current; struct task_struct *task = current;
if (!task) if (unlikely(!task))
return -EINVAL; return -EINVAL;
return (u64) task->tgid << 32 | task->pid; return (u64) task->tgid << 32 | task->pid;
@ -144,12 +144,12 @@ static u64 bpf_get_current_uid_gid(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)
kuid_t uid; kuid_t uid;
kgid_t gid; kgid_t gid;
if (!task) if (unlikely(!task))
return -EINVAL; return -EINVAL;
current_uid_gid(&uid, &gid); current_uid_gid(&uid, &gid);
return (u64) from_kgid(&init_user_ns, gid) << 32 | return (u64) from_kgid(&init_user_ns, gid) << 32 |
from_kuid(&init_user_ns, uid); from_kuid(&init_user_ns, uid);
} }
const struct bpf_func_proto bpf_get_current_uid_gid_proto = { const struct bpf_func_proto bpf_get_current_uid_gid_proto = {

7
net/core/filter.c
View File

@ -2010,8 +2010,7 @@ static u32 __bpf_skb_min_len(const struct sk_buff *skb)
static u32 __bpf_skb_max_len(const struct sk_buff *skb) static u32 __bpf_skb_max_len(const struct sk_buff *skb)
{ {
return skb->dev ? skb->dev->mtu + skb->dev->hard_header_len : return skb->dev->mtu + skb->dev->hard_header_len;
65536;
} }
static int bpf_skb_grow_rcsum(struct sk_buff *skb, unsigned int new_len) static int bpf_skb_grow_rcsum(struct sk_buff *skb, unsigned int new_len)
@ -2605,7 +2604,7 @@ static bool __is_valid_xdp_access(int off, int size,
return false; return false;
if (off % size != 0) if (off % size != 0)
return false; return false;
if (size != 4) if (size != sizeof(__u32))
return false; return false;
return true; return true;
@ -2727,7 +2726,7 @@ static u32 bpf_net_convert_ctx_access(enum bpf_access_type type, int dst_reg,
dst_reg, src_reg, insn); dst_reg, src_reg, insn);
case offsetof(struct __sk_buff, cb[0]) ... case offsetof(struct __sk_buff, cb[0]) ...
offsetof(struct __sk_buff, cb[4]): offsetof(struct __sk_buff, cb[4]):
BUILD_BUG_ON(FIELD_SIZEOF(struct qdisc_skb_cb, data) < 20); BUILD_BUG_ON(FIELD_SIZEOF(struct qdisc_skb_cb, data) < 20);
prog->cb_access = 1; prog->cb_access = 1;