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

!9495 netrom: fix possible dead-lock in nr_rt_ioctl() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Pu Lehui <pulehui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/O3ZD76ZKFAYHLNLY2QDL3SBEQ3PCD4ZH/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SHC 
 
Link:https://gitee.com/openeuler/kernel/pulls/9495

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 12b4c31f c65cf08e

net/netrom/nr_route.c

+7 −12
Original line number Diff line number Diff line
@@ -284,22 +284,14 @@ static int __must_check nr_add_node(ax25_address *nr, const char *mnemonic, 
	return 0;

}



static inline void __nr_remove_node(struct nr_node *nr_node)

static void nr_remove_node_locked(struct nr_node *nr_node)

{

	lockdep_assert_held(&nr_node_list_lock);



	hlist_del_init(&nr_node->node_node);

	nr_node_put(nr_node);

}



#define nr_remove_node_locked(__node) \

	__nr_remove_node(__node)



static void nr_remove_node(struct nr_node *nr_node)

{

	spin_lock_bh(&nr_node_list_lock);

	__nr_remove_node(nr_node);

	spin_unlock_bh(&nr_node_list_lock);

}



static inline void __nr_remove_neigh(struct nr_neigh *nr_neigh)

{

	hlist_del_init(&nr_neigh->neigh_node);
@@ -338,6 +330,7 @@ static int nr_del_node(ax25_address *callsign, ax25_address *neighbour, struct n 
		return -EINVAL;

	}



	spin_lock_bh(&nr_node_list_lock);

	nr_node_lock(nr_node);

	for (i = 0; i < nr_node->count; i++) {

		if (nr_node->routes[i].neighbour == nr_neigh) {
@@ -351,7 +344,7 @@ static int nr_del_node(ax25_address *callsign, ax25_address *neighbour, struct n 
			nr_node->count--;



			if (nr_node->count == 0) {

				nr_remove_node(nr_node);

				nr_remove_node_locked(nr_node);

			} else {

				switch (i) {

				case 0:
@@ -365,12 +358,14 @@ static int nr_del_node(ax25_address *callsign, ax25_address *neighbour, struct n 
				nr_node_put(nr_node);

			}

			nr_node_unlock(nr_node);

			spin_unlock_bh(&nr_node_list_lock);



			return 0;

		}

	}

	nr_neigh_put(nr_neigh);

	nr_node_unlock(nr_node);

	spin_unlock_bh(&nr_node_list_lock);

	nr_node_put(nr_node);



	return -EINVAL;