[PATCH openEuler-1.0-LTS] netrom: Decrease sock refcount when sock timers expire - Kernel

6 Jun 2024

From: Nguyen Dinh Phi phind.uet@gmail.com
stable inclusion
from stable-v4.19.199
commit 9619cc7d97c3aa8ed3cfd2b8678b74fb6d6c7950
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9R4JQ
CVE: CVE-2021-47294
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
---------------------------
[ Upstream commit 517a16b1a88bdb6b530f48d5d153478b2552d9a8 ]
Commit 63346650c1a9 ("netrom: switch to sock timer API") switched to use
sock timer API. It replaces mod_timer() by sk_reset_timer(), and
del_timer() by sk_stop_timer().
Function sk_reset_timer() will increase the refcount of sock if it is
called on an inactive timer, hence, in case the timer expires, we need to
decrease the refcount ourselves in the handler, otherwise, the sock
refcount will be unbalanced and the sock will never be freed.
Signed-off-by: Nguyen Dinh Phi phind.uet@gmail.com
Reported-by: syzbot+10f1194569953b72f1ae@syzkaller.appspotmail.com
Fixes: 63346650c1a9 ("netrom: switch to sock timer API")
Signed-off-by: David S. Miller davem@davemloft.net
Signed-off-by: Sasha Levin sashal@kernel.org
Signed-off-by: Hui Tang tanghui20@huawei.com
---
 net/netrom/nr_timer.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index 908e53ab47a4..426d49609524 100644
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -124,11 +124,9 @@ 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))) {
-			sock_hold(sk);
    		bh_unlock_sock(sk);
    		nr_destroy_socket(sk);
-			sock_put(sk);
-			return;
+			goto out;
    	}
    	break;
@@ -149,6 +147,8 @@ static void nr_heartbeat_expiry(struct timer_list *t)
nr_start_heartbeat(sk);
    bh_unlock_sock(sk);
+out:
+	sock_put(sk);
 }
static void nr_t2timer_expiry(struct timer_list *t)
@@ -162,6 +162,7 @@ static void nr_t2timer_expiry(struct timer_list *t)
    	nr_enquiry_response(sk);
    }
    bh_unlock_sock(sk);
+	sock_put(sk);
 }
static void nr_t4timer_expiry(struct timer_list *t)
@@ -172,6 +173,7 @@ static void nr_t4timer_expiry(struct timer_list *t)
    bh_lock_sock(sk);
    nr_sk(sk)->condition &= ~NR_COND_PEER_RX_BUSY;
    bh_unlock_sock(sk);
+	sock_put(sk);
 }
static void nr_idletimer_expiry(struct timer_list *t)
@@ -200,6 +202,7 @@ static void nr_idletimer_expiry(struct timer_list *t)
    	sock_set_flag(sk, SOCK_DEAD);
    }
    bh_unlock_sock(sk);
+	sock_put(sk);
 }
static void nr_t1timer_expiry(struct timer_list *t)
@@ -212,8 +215,7 @@ static void nr_t1timer_expiry(struct timer_list *t)
    case NR_STATE_1:
    	if (nr->n2count == nr->n2) {
    		nr_disconnect(sk, ETIMEDOUT);
-			bh_unlock_sock(sk);
-			return;
+			goto out;
    	} else {
    		nr->n2count++;
    		nr_write_internal(sk, NR_CONNREQ);
@@ -223,8 +225,7 @@ static void nr_t1timer_expiry(struct timer_list *t)
    case NR_STATE_2:
    	if (nr->n2count == nr->n2) {
    		nr_disconnect(sk, ETIMEDOUT);
-			bh_unlock_sock(sk);
-			return;
+			goto out;
    	} else {
    		nr->n2count++;
    		nr_write_internal(sk, NR_DISCREQ);
@@ -234,8 +235,7 @@ static void nr_t1timer_expiry(struct timer_list *t)
    case NR_STATE_3:
    	if (nr->n2count == nr->n2) {
    		nr_disconnect(sk, ETIMEDOUT);
-			bh_unlock_sock(sk);
-			return;
+			goto out;
    	} else {
    		nr->n2count++;
    		nr_requeue_frames(sk);
@@ -244,5 +244,7 @@ static void nr_t1timer_expiry(struct timer_list *t)
    }
nr_start_t1timer(sk);
+out:
    bh_unlock_sock(sk);
+	sock_put(sk);
 }
-- 
2.34.1


    