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

!15097 net: inet6: do not leave a dangling sk pointer in inet6_create() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/GE72DOT7IGXG26BQTPPPLNOQDLTXHDPW/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEAPG 
 
Link:https://gitee.com/openeuler/kernel/pulls/15097

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 1de65309 cdc4865b

net/ipv6/af_inet6.c

+10 −12
Original line number Diff line number Diff line
@@ -259,31 +259,29 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol, 
		 */

		inet->inet_sport = htons(inet->inet_num);

		err = sk->sk_prot->hash(sk);

		if (err) {

			sk_common_release(sk);

			goto out;

		}

		if (err)

			goto out_sk_release;

	}

	if (sk->sk_prot->init) {

		err = sk->sk_prot->init(sk);

		if (err) {

			sk_common_release(sk);

			goto out;

		}

		if (err)

			goto out_sk_release;

	}



	if (!kern) {

		err = BPF_CGROUP_RUN_PROG_INET_SOCK(sk);

		if (err) {

			sk_common_release(sk);

			goto out;

		}

		if (err)

			goto out_sk_release;

	}

out:

	return err;

out_rcu_unlock:

	rcu_read_unlock();

	goto out;

out_sk_release:

	sk_common_release(sk);

	sock->sk = NULL;

	goto out;

}



static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,