From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517180751-2-14726130549139880443 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=1517180750; b=g8MtbgFqV6zLyt+hVWVJlQpWMPcxNB8AEpxBnixdzvL7g+o baBYF0t+f+OXS5HFIXMTgBq2q1z1ztkpYdf1vSWgnKsIDrc5BTZA6oICml7AhMLg AsmEi7itxccyEOnbcC0dVoZ6dbuIN7XN0BzXmJ4NeMUAxtQsxUYzpyjpc14IvZ6k DrFWVvbDNZkaI1hiVm6Janryg4+JFmdnAEYRjTSsGRJGG1hpKUKWlaPVr+5nTSQQ MUZKgXXTUQooKSlZ3i7XK0yimQLmdQ+j5YzO3A16Dh9txUvUF4P+WIQYKAXb6qba P8dDfQcDKbKxUrATKMHtdWMmvLNCw4Z5lMwVBVA== 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=1517180750; bh=UVy6kZ TmPlGORKBynUYFK24ZzquI8HQFvANgL25Lekw=; b=bkvS2kUBC3Dvzl8XpvAHQc ZPlOHMG330lWSPWyd+Z4aOtXlRYdXTer7KZCfVR0q+i3SF9XyuvS2JxTuldG5fE0 3bxefsXVxNbEBMyaHDYGz0Ay59VQsjtcZ0Q97+u4JEDvcxOqkE5Va9z/D888y4zk 4JR+EFZN79XF+Mxv+VAPlfaJWjpch8FqOjU9Kn2tVvX+XCwZ/7Ig30dn+Uup7x97 HX/G+iOIo2K/OsEEPDFChxeCcuGkKg7BdnQMkFYfD3KEPm0drj5lax7O6DE5uwoB 4Ey99HQkrmw+PLIDm4JUWSOHWnCe5AWL3CAuLJ9HQI3WBn4DfdQ74iQ3a/FUwong == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=i/o6AHJq 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: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=i/o6AHJq 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 S1751475AbeA1XFp (ORCPT ); Sun, 28 Jan 2018 18:05:45 -0500 Received: from mail-co1nam03on0111.outbound.protection.outlook.com ([104.47.40.111]:36928 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753409AbeA1W1J (ORCPT ); Sun, 28 Jan 2018 17:27:09 -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.14 059/100] dccp: CVE-2017-8824: use-after-free in DCCP code Thread-Topic: [PATCH AUTOSEL for 4.14 059/100] dccp: CVE-2017-8824: use-after-free in DCCP code Thread-Index: AQHTmIcP9amF9W4f2kqNtwE5eVpeCw== Date: Sun, 28 Jan 2018 22:26:37 +0000 Message-ID: <20180128222547.7398-59-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-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;MW2PR2101MB1034;6:9MYL+NEZ3/6P4xTxbiVCNfbzA/2f+1bx94o21S5g1jhhzRHHb0jaXPZ8JhF65Vpww1lYUBh4BENTcY6NoRjYQggGKxi+6tZtEZ8/myRmUV8RDXBQvBL8ghFP8Eftp4NGbViHvbQGgXIdbxPn/x4jsVAFxytffQnOJ5kO7i+L9AsWnjAflXSXHZCi8tlkmEgMpEENiIKqHsXgHG56WHHnuUOXHk5LRqx8llsAvHnQ+vepg2Gv2rp4cTEV36RI0/DNo0+KpsS2MBO1PVrqi7vVISAe+um3btZTYQCWdnlNxqZ+8l/ZgXPsKorNVmmvHm30a8P5q2xmxvl3PyLkhNGz7zgm+SGDSXtrFpljrDHKQC+NVyh/X7oTc5efCge4ACDz;5:1zdbuoqWCUdl+PWfJn/10BooANWR7KsTC23kBltwpoztqiD9AS4vn9InT4I41iboI6moBVg1EGHW39ydvB1CDLCzLxhvynAmjrie7m3pKecAngOU5Y2vNi7hL7JI4uLaela13Q6pN/8VTop8TpH30E2zXCBMONg1+m9d7Rr3ZHw=;24:h46r8eFEL3o6BviEEthRut+DbXDOPjZde2rYb43WSYfbP0/eDK2NlXtFGHk2GY3C7t9LD6DAphkVarwhw9oBTFLlsUMo4604tQi+EQDMNM0=;7:jrr6oq+WmNy+At4o2gxJjr6RpvON4Da9c5mpubzyuUmO7ErMC1ah4TnNkLvJZXyfx49ywEnAzaSTjjJj1DC4JfvpsvXqtVkj7BzRHga0yIdQLV2drRQ07rVKZKaMde9hjVYpMj2xeLhW0LTgXBneWWQxJChQdWwmIPCflEkSbBanGqnkTPwgUYzKSZokFCuzT1m1YYvD31l9Bm0/e6evezY1sPynObcyCyrJDXEkRnx5ULYTB0H3b1KgelPfv6nb x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 9f4116f4-066f-44c3-1615-08d5669e411d x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1034; x-ms-traffictypediagnostic: MW2PR2101MB1034: 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)(10201501046)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1034;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1034; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(346002)(376002)(396003)(366004)(39380400002)(199004)(189003)(2906002)(2950100002)(26005)(1076002)(66066001)(6116002)(5660300001)(3846002)(186003)(316002)(22452003)(54906003)(110136005)(6666003)(86612001)(36756003)(6486002)(575784001)(86362001)(53936002)(6436002)(6512007)(106356001)(8676002)(105586002)(305945005)(7736002)(39060400002)(68736007)(478600001)(81166006)(59450400001)(102836004)(76176011)(6506007)(72206003)(10290500003)(14454004)(2900100001)(3660700001)(99286004)(97736004)(81156014)(25786009)(8936002)(4326008)(5250100002)(3280700002)(2501003)(10090500001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1034;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: 0qKzFJ5zYzSNjju2RxJDbVZFRXfcyKIgMoiWDM59J331CmpCqR3dRKOw6+fGapwDTJ+P8sCSK9ROKyGa/pkSsw== 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: 9f4116f4-066f-44c3-1615-08d5669e411d X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:37.4854 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1034 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