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

!15690 net: rose: fix timer races against user threads 

Merge Pull Request from: @ci-robot 
 
PR sync from: Gu Bowen <gubowen5@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/QF7P2JQPKO5U7Y3E2B6NV6ZH2J6BMOUN/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBPBF2 
 
Link:https://gitee.com/openeuler/kernel/pulls/15690

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarLu Jialin <lujialin4@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 8263832a f36afde4

net/rose/rose_timer.c

+15 −0
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ static void rose_heartbeat_expiry(struct timer_list *t) 
	struct rose_sock *rose = rose_sk(sk);



	bh_lock_sock(sk);

	if (sock_owned_by_user(sk)) {

		sk_reset_timer(sk, &sk->sk_timer, jiffies + HZ/20);

		goto out;

	}

	switch (rose->state) {

	case ROSE_STATE_0:

		/* Magic here: If we listen() and a new link dies before it
@@ -152,6 +156,7 @@ static void rose_heartbeat_expiry(struct timer_list *t) 
	}



	rose_start_heartbeat(sk);

out:

	bh_unlock_sock(sk);

	sock_put(sk);

}
@@ -162,6 +167,10 @@ static void rose_timer_expiry(struct timer_list *t) 
	struct sock *sk = &rose->sock;



	bh_lock_sock(sk);

	if (sock_owned_by_user(sk)) {

		sk_reset_timer(sk, &rose->timer, jiffies + HZ/20);

		goto out;

	}

	switch (rose->state) {

	case ROSE_STATE_1:	/* T1 */

	case ROSE_STATE_4:	/* T2 */
@@ -182,6 +191,7 @@ static void rose_timer_expiry(struct timer_list *t) 
		}

		break;

	}

out:

	bh_unlock_sock(sk);

	sock_put(sk);

}
@@ -192,6 +202,10 @@ static void rose_idletimer_expiry(struct timer_list *t) 
	struct sock *sk = &rose->sock;



	bh_lock_sock(sk);

	if (sock_owned_by_user(sk)) {

		sk_reset_timer(sk, &rose->idletimer, jiffies + HZ/20);

		goto out;

	}

	rose_clear_queues(sk);



	rose_write_internal(sk, ROSE_CLEAR_REQUEST);
@@ -207,6 +221,7 @@ static void rose_idletimer_expiry(struct timer_list *t) 
		sk->sk_state_change(sk);

		sock_set_flag(sk, SOCK_DEAD);

	}

out:

	bh_unlock_sock(sk);

	sock_put(sk);

}