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

!9030 bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue 

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

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 805b167e 9be41f39

include/linux/skmsg.h

+2 −0
Original line number Diff line number Diff line
@@ -477,10 +477,12 @@ static inline void sk_psock_put(struct sock *sk, struct sk_psock *psock) 


static inline void sk_psock_data_ready(struct sock *sk, struct sk_psock *psock)

{

	read_lock_bh(&sk->sk_callback_lock);

	if (psock->parser.enabled)

		psock->parser.saved_data_ready(sk);

	else

		sk->sk_data_ready(sk);

	read_unlock_bh(&sk->sk_callback_lock);

}



static inline void psock_set_prog(struct bpf_prog **pprog,