Commit 404fda9b authored by Lu Wei's avatar Lu Wei Committed by Dong Chenchen
Browse files

bpf: fix magic numbers in bpf_get_sockops_uid_gid() 

hulk inclusion
category: bugfix
bugzilla: 187830, https://gitee.com/openeuler/kernel/issues/I9K8D1



--------------------------------

32 is a magic number, use "BITS_PER_BYTE * sizeof(u32)" to
replace it.

Fixes: 0a0306da1658 ("bpf: Add bpf_get_sockops_uid_gid helper function")
Signed-off-by: default avatarLu Wei <luwei32@huawei.com>
Signed-off-by: default avatarDong Chenchen <dongchenchen2@huawei.com>
parent 71195b88

net/core/filter.c

+2 −1
Original line number Diff line number Diff line
@@ -5107,7 +5107,8 @@ BPF_CALL_1(bpf_get_sockops_uid_gid, struct bpf_sock_ops_kern *, bpf_sock) 
	uid = sock_net_uid(sock_net(sk), sk);

	gid = sock_net_gid(sock_net(sk), sk);



	return ((u64)from_kgid_munged(sock_net(sk)->user_ns, gid)) << 32 |

	return ((u64)from_kgid_munged(sock_net(sk)->user_ns, gid)) <<

		(BITS_PER_BYTE * sizeof(u32)) |

		from_kuid_munged(sock_net(sk)->user_ns, uid);

}