Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6088b582 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

bpf: minor cleanups in helpers 



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: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf8d85d4

kernel/bpf/helpers.c

+3 −3
Original line number Diff line number Diff line
@@ -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;



	if (!task)

	if (unlikely(!task))

		return -EINVAL;



	return (u64) task->tgid << 32 | task->pid;
@@ -144,7 +144,7 @@ static u64 bpf_get_current_uid_gid(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5) 
	kuid_t uid;

	kgid_t gid;



	if (!task)

	if (unlikely(!task))

		return -EINVAL;



	current_uid_gid(&uid, &gid);

net/core/filter.c

+3 −4
Original line number Diff line number Diff line
@@ -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)

{

	return skb->dev ? skb->dev->mtu + skb->dev->hard_header_len :

	       65536;

	return skb->dev->mtu + skb->dev->hard_header_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;

	if (off % size != 0)

		return false;

	if (size != 4)

	if (size != sizeof(__u32))

		return false;



	return true;