Unverified Commit 10c423d1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9788 net: fix wrong return value in bpf_sock_ops_get_uid_gid 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7Q7PFUBDWI53ABJM4OBCHWN4ZVI4264I/ 
 
https://gitee.com/openeuler/kernel/issues/I8KU3B 
 
Link:https://gitee.com/openeuler/kernel/pulls/9788

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents bdca5f9c 42349cf4

net/core/filter.c

+1 −1
Original line number Diff line number Diff line
@@ -5675,7 +5675,7 @@ static int bpf_sock_ops_get_uid_gid(struct bpf_sock_ops_kern *bpf_sock, 
	*(u32 *)optval = from_kgid_munged(sock_net(sk)->user_ns, gid);

	*((u32 *)optval + 1) = from_kuid_munged(sock_net(sk)->user_ns, uid);



	return sizeof(u64);

	return 0;

}



static int bpf_sk_original_addr(struct bpf_sock_ops_kern *bpf_sock,