From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227y4LQ7hTmDDw/y5Vl1we6KmCkLUd9acsJwUUQ/TvlYkfJt84DttRDNbcnCMeivBfS0kDYY ARC-Seal: i=1; a=rsa-sha256; t=1517256764; cv=none; d=google.com; s=arc-20160816; b=azNYpXY7FSYspNx69n5T2MPH1ADAEsL8cXKjbPgHVIqUHFca3onjDuskYOBGtSXorY UXdj8DFAG/cUJFMR/eDt/YM5wFt/DAuj5iHoqpAu1fZc0rMFuIB27QGcHT+jEIzswfWU ibIzMJYtZOGjYs/CfV22G2NpCZFefIu/O5/qmkDnIdYnGDWQL0NfreHefVYynuaPABur abrXYjbg8ZtxghB2M2j0rmY1/qtnooXjh+Lgv+p42pYVBxSfQmKNOGlo1jKapAL+WaUA CBtzJxNEARfS8SIF7t24naLmLttQ/4T/LfxrI7tSeSIQr2jEO8IK2sjGuAPhsvX+ZKCx 45Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=6aZ5APWKOyDMVfPEMsQ1+lVdY5Mn9b9kkXa10D2ASoQ=; b=qaqPC164HtoDpRcW2P3qGnMX0BIa5d4ZeASTcYxF8erBZueG1D1RtpK3CWGnF5gJqZ 6tPsl95WTl6DXvEJ3v17ws7cI1CeusC9xM9m+khvVW6gyLbcKOcGVMgGBh2fOE7wHyMf j6ot06o9yMwL2CT4e6BUNrjlxlW4szYLxO1P0xXHEaYSGNcsy/kFiMNQ0U0vbuQBjpoM XzzVFgUAG7BNug89TYbkKZCqMLC/sFJ/DFHsXIYozUjo35bSmB9CHmOvRd2mqW8VZ+jN L/3DyQAlz8LcfNPGBjLHLuVU56/qinsc75HwuQkbqZW++/xtl3UbrF0/pPllRZSqwtaq mYeA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexey Kodanev , Eric Dumazet , "David S. Miller" Subject: [PATCH 4.9 33/66] dccp: dont restart ccid2_hc_tx_rto_expire() if sk in closed state Date: Mon, 29 Jan 2018 13:56:57 +0100 Message-Id: <20180129123841.579832579@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123839.842860149@linuxfoundation.org> References: <20180129123839.842860149@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958473784622659?= X-GMAIL-MSGID: =?utf-8?q?1590959028583282016?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexey Kodanev [ Upstream commit dd5684ecae3bd8e44b644f50e2c12c7e57fdfef5 ] ccid2_hc_tx_rto_expire() timer callback always restarts the timer again and can run indefinitely (unless it is stopped outside), and after commit 120e9dabaf55 ("dccp: defer ccid_hc_tx_delete() at dismantle time"), which moved ccid_hc_tx_delete() (also includes sk_stop_timer()) from dccp_destroy_sock() to sk_destruct(), this started to happen quite often. The timer prevents releasing the socket, as a result, sk_destruct() won't be called. Found with LTP/dccp_ipsec tests running on the bonding device, which later couldn't be unloaded after the tests were completed: unregister_netdevice: waiting for bond0 to become free. Usage count = 148 Fixes: 2a91aa396739 ("[DCCP] CCID2: Initial CCID2 (TCP-Like) implementation") Signed-off-by: Alexey Kodanev Reviewed-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/dccp/ccids/ccid2.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c @@ -140,6 +140,9 @@ static void ccid2_hc_tx_rto_expire(unsig ccid2_pr_debug("RTO_EXPIRE\n"); + if (sk->sk_state == DCCP_CLOSED) + goto out; + /* back-off timer */ hc->tx_rto <<= 1; if (hc->tx_rto > DCCP_RTO_MAX)