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

!6447 can: j1939: prevent deadlock by changing j1939_socks_lock to rwlock 

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

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 8e062104 55150eac

net/can/j1939/j1939-priv.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ struct j1939_priv { 
	unsigned int tp_max_packet_size;

	unsigned int tp_max_packet_size;





	/* lock for j1939_socks list */

	/* lock for j1939_socks list */

	spinlock_t j1939_socks_lock;

	rwlock_t j1939_socks_lock;

	struct list_head j1939_socks;

	struct list_head j1939_socks;





	struct kref rx_kref;

	struct kref rx_kref;

net/can/j1939/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -262,7 +262,7 @@ struct j1939_priv *j1939_netdev_start(struct net_device *ndev) 
		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);





	j1939_tp_init(priv);

	j1939_tp_init(priv);

	spin_lock_init(&priv->j1939_socks_lock);

	rwlock_init(&priv->j1939_socks_lock);

	INIT_LIST_HEAD(&priv->j1939_socks);

	INIT_LIST_HEAD(&priv->j1939_socks);





	spin_lock(&j1939_netdev_lock);

	spin_lock(&j1939_netdev_lock);

net/can/j1939/socket.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -79,16 +79,16 @@ static void j1939_jsk_add(struct j1939_priv *priv, struct j1939_sock *jsk) 
	jsk->state |= J1939_SOCK_BOUND;

	jsk->state |= J1939_SOCK_BOUND;

	j1939_priv_get(priv);

	j1939_priv_get(priv);





	spin_lock_bh(&priv->j1939_socks_lock);

	write_lock_bh(&priv->j1939_socks_lock);

	list_add_tail(&jsk->list, &priv->j1939_socks);

	list_add_tail(&jsk->list, &priv->j1939_socks);

	spin_unlock_bh(&priv->j1939_socks_lock);

	write_unlock_bh(&priv->j1939_socks_lock);

}

}





static void j1939_jsk_del(struct j1939_priv *priv, struct j1939_sock *jsk)

static void j1939_jsk_del(struct j1939_priv *priv, struct j1939_sock *jsk)

{

{

	spin_lock_bh(&priv->j1939_socks_lock);

	write_lock_bh(&priv->j1939_socks_lock);

	list_del_init(&jsk->list);

	list_del_init(&jsk->list);

	spin_unlock_bh(&priv->j1939_socks_lock);

	write_unlock_bh(&priv->j1939_socks_lock);





	j1939_priv_put(priv);

	j1939_priv_put(priv);

	jsk->state &= ~J1939_SOCK_BOUND;

	jsk->state &= ~J1939_SOCK_BOUND;
@@ -336,13 +336,13 @@ bool j1939_sk_recv_match(struct j1939_priv *priv, struct j1939_sk_buff_cb *skcb) 
	struct j1939_sock *jsk;

	struct j1939_sock *jsk;

	bool match = false;

	bool match = false;





	spin_lock_bh(&priv->j1939_socks_lock);

	read_lock_bh(&priv->j1939_socks_lock);

	list_for_each_entry(jsk, &priv->j1939_socks, list) {

	list_for_each_entry(jsk, &priv->j1939_socks, list) {

		match = j1939_sk_recv_match_one(jsk, skcb);

		match = j1939_sk_recv_match_one(jsk, skcb);

		if (match)

		if (match)

			break;

			break;

	}

	}

	spin_unlock_bh(&priv->j1939_socks_lock);

	read_unlock_bh(&priv->j1939_socks_lock);





	return match;

	return match;

}

}
@@ -351,11 +351,11 @@ void j1939_sk_recv(struct j1939_priv *priv, struct sk_buff *skb) 
{

{

	struct j1939_sock *jsk;

	struct j1939_sock *jsk;





	spin_lock_bh(&priv->j1939_socks_lock);

	read_lock_bh(&priv->j1939_socks_lock);

	list_for_each_entry(jsk, &priv->j1939_socks, list) {

	list_for_each_entry(jsk, &priv->j1939_socks, list) {

		j1939_sk_recv_one(jsk, skb);

		j1939_sk_recv_one(jsk, skb);

	}

	}

	spin_unlock_bh(&priv->j1939_socks_lock);

	read_unlock_bh(&priv->j1939_socks_lock);

}

}





static void j1939_sk_sock_destruct(struct sock *sk)

static void j1939_sk_sock_destruct(struct sock *sk)
@@ -1185,7 +1185,7 @@ void j1939_sk_netdev_event_netdown(struct j1939_priv *priv) 
	struct j1939_sock *jsk;

	struct j1939_sock *jsk;

	int error_code = ENETDOWN;

	int error_code = ENETDOWN;





	spin_lock_bh(&priv->j1939_socks_lock);

	read_lock_bh(&priv->j1939_socks_lock);

	list_for_each_entry(jsk, &priv->j1939_socks, list) {

	list_for_each_entry(jsk, &priv->j1939_socks, list) {

		jsk->sk.sk_err = error_code;

		jsk->sk.sk_err = error_code;

		if (!sock_flag(&jsk->sk, SOCK_DEAD))

		if (!sock_flag(&jsk->sk, SOCK_DEAD))
@@ -1193,7 +1193,7 @@ void j1939_sk_netdev_event_netdown(struct j1939_priv *priv) 




		j1939_sk_queue_drop_all(priv, jsk, error_code);

		j1939_sk_queue_drop_all(priv, jsk, error_code);

	}

	}

	spin_unlock_bh(&priv->j1939_socks_lock);

	read_unlock_bh(&priv->j1939_socks_lock);

}

}





static int j1939_sk_no_ioctlcmd(struct socket *sock, unsigned int cmd,

static int j1939_sk_no_ioctlcmd(struct socket *sock, unsigned int cmd,