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

!10172 netrom: Fix a memory leak in nr_heartbeat_expiry() 

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

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents b057ca57 c83d0b12

net/netrom/nr_timer.c

+2 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ static void nr_heartbeat_expiry(struct timer_list *t) 
		   is accepted() it isn't 'dead' so doesn't get removed. */

		if (sock_flag(sk, SOCK_DESTROY) ||

		    (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {

			if (sk->sk_state == TCP_LISTEN)

				sock_hold(sk);

			bh_unlock_sock(sk);

			nr_destroy_socket(sk);