From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517179113-2-11707713690531478046 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES encaro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517179113; b=O4pcBoP/43lvfcoO1a23xVCHmAVMBf/qBcDBe6v3U7MPbps YqXLwZ8aAJpn25AEd2w0kefcmgHHsJZpqsgpuQJA1UyLdD4tv0187qfnjy3AU0vo u6u+VW2EMBiQdgcNms7iloP52f9+ZCdSIrwfCzrC8N/3eTgA/trBP0I+0CzZS2OC SGhYEpImZxx1K1ltCNLLWWFFMtCc/Mw+t82DXCG90kh9+lYRnkJ+9iX2I3gL2Q+U acM4MapKzq7AX9waK7SwEEFcO3HDz4G7K3o3E/gY6STgTeTSKSx5rokY8Z4M2MQq 21F9Ht7AiG62WxUSl/dXPpg8fNAqfH7GNTvYeYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517179113; bh=UVy6kZ TmPlGORKBynUYFK24ZzquI8HQFvANgL25Lekw=; b=u6JdQ+uYwaPjGaX+tt4KIB 7MEnSSTB8bN31GPqnpK1GLIDklfxpfSreKAbAYpdiMoprgpbJF6HGmGxYCTTg4I2 X0A6V4XPtr6BlnMC1NBmBPQ8fAoUWb/N75qPocKulxShi4B+gkkMCKaUyR9n6i3l EESnJin+qZbcJ93DMtkadTBph0uoySmQq6u/5s5k0NcEurnlKfS54o9nIfSGq4uO VvqM1Gwx2bnwGL1zXLkVgG1/hdT24plU9iy1fa55E3qOdramd+N0rom8FcvFNC8K y8BT6KX5Nd0u7DSdqC4t0Bo5m9aagQ0tTBo47B+eP9sr3SFFHA1cW9MjsWJeKRQA == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=WCnDvnvp x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=WCnDvnvp x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932541AbeA1WaJ (ORCPT ); Sun, 28 Jan 2018 17:30:09 -0500 Received: from mail-bn3nam01on0104.outbound.protection.outlook.com ([104.47.33.104]:34771 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932459AbeA1W36 (ORCPT ); Sun, 28 Jan 2018 17:29:58 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Mohamed Ghannam , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 19/36] dccp: CVE-2017-8824: use-after-free in DCCP code Thread-Topic: [PATCH AUTOSEL for 4.4 19/36] dccp: CVE-2017-8824: use-after-free in DCCP code Thread-Index: AQHTmIdWY5nVpSmroUmLMPkja2248Q== Date: Sun, 28 Jan 2018 22:28:36 +0000 Message-ID: <20180128222815.29479-19-alexander.levin@microsoft.com> References: <20180128222815.29479-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222815.29479-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1115;6:jd0p9vfGnejRF3vYN9ByiHXQ+RQoCrjbDZn7fJ8gjUWHTgyS1ni4LIJAtzrHth54W9nCICU5S6XZiggdwfnH+AGfSfnzRFKwarHza5mo30QVyFxp3ZsMy0aNljItpzpNTJA7/KSObW6wAoJek1R2n4Z+W0wIktlFfj4TqbrQLMu4QUhmE3FFH7HkFDOlfxuxCIaaDrakU3PcRHZTfYDE3pv+reG5T9kzMW2lGc68vUJStw2rmuKty0mPC0zLn/gby6YsMDFMDmp7tLMxA1A6/hnnp+Vb4aZNkP5nNse7MMg07NZEjgJCe6hicGbKQHdJ0oYe3SEgjZnCFnmYij9tnys94SRQE7dZKdnhNPX0icpLEP9nb3vhGigalRhMrdIU;5:yR97fKZj5WYpKvy22cHPJowhsXUPLAkzdpEAytXULaW4MuNd9/hmg628tEl/eBp94dPlspV4k1DZ20XQOY4mNeYwBfR36fWeVlhnpOkZ0LXzXgDxAcGmx4LMsCoiXAn3lGu6CKuLXA+QtkG0WNOAjHYX5TKIOdrrOrjqb62VYng=;24:XJVgBoH3VESULZVP34K833V9BANbvBkKkw6Ti1qqp/zkOMwepwjPQnCIAk5u4hwX+0ZhaJuJRGoJUQDeFEtk9rJOM19b1hbZMDCP6nzDhnA=;7:nF2VN57kJco0nwx2dGcGsOqfy/qXMfgewAFcQf2OlQ0MwpWttizcBG3Dxjuc0jjNcHdvnywSzw4Y53VjnvtROlwK8h421yXzWp4M4AerL1mgyJMgUHzDIeMm8CHEsiuYhdjQLCjs03YoDio6nq7yvuhpcaHbzV0ZwVUos3Lzhtk9Cg1Gfv/U5U+hosfWjmiweBepI3UOTzFfx7hgOCmuH6gkdUnK4XhLdOkoi68+7gQey58A55JsSK46xpKqkpdl x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 17d8324b-1010-4ddb-1898-08d5669ea4aa x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1115; x-ms-traffictypediagnostic: MW2PR2101MB1115: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(211936372134217)(153496737603132); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB1115;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1115; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(346002)(39860400002)(396003)(366004)(39380400002)(199004)(189003)(3280700002)(2906002)(4326008)(6486002)(6512007)(102836004)(53936002)(97736004)(1076002)(3660700001)(105586002)(3846002)(54906003)(110136005)(186003)(66066001)(25786009)(26005)(305945005)(39060400002)(6116002)(99286004)(107886003)(6436002)(81156014)(5250100002)(81166006)(8676002)(22452003)(86362001)(2950100002)(36756003)(316002)(478600001)(106356001)(8936002)(2501003)(5660300001)(7736002)(575784001)(6666003)(72206003)(10090500001)(68736007)(10290500003)(86612001)(2900100001)(14454004)(76176011)(59450400001)(6506007)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1115;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: 2r3ENqvjuYG4Vx+o6wHy+hQGiPat241exZTithKZt/Zs6zDLUPZfdMBvpP7pUT7dQDYNDpML+GdKclD2iyjjKA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17d8324b-1010-4ddb-1898-08d5669ea4aa X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:36.3339 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1115 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Mohamed Ghannam [ Upstream commit 69c64866ce072dea1d1e59a0d61e0f66c0dffb76 ] Whenever the sock object is in DCCP_CLOSED state, dccp_disconnect() must free dccps_hc_tx_ccid and dccps_hc_rx_ccid and set to NULL. Signed-off-by: Mohamed Ghannam Reviewed-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/dccp/proto.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/dccp/proto.c b/net/dccp/proto.c index b68168fcc06a..9d43c1f40274 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -259,6 +259,7 @@ int dccp_disconnect(struct sock *sk, int flags) { struct inet_connection_sock *icsk =3D inet_csk(sk); struct inet_sock *inet =3D inet_sk(sk); + struct dccp_sock *dp =3D dccp_sk(sk); int err =3D 0; const int old_state =3D sk->sk_state; =20 @@ -278,6 +279,10 @@ int dccp_disconnect(struct sock *sk, int flags) sk->sk_err =3D ECONNRESET; =20 dccp_clear_xmit_timers(sk); + ccid_hc_rx_delete(dp->dccps_hc_rx_ccid, sk); + ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk); + dp->dccps_hc_rx_ccid =3D NULL; + dp->dccps_hc_tx_ccid =3D NULL; =20 __skb_queue_purge(&sk->sk_receive_queue); __skb_queue_purge(&sk->sk_write_queue); --=20 2.11.0