From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1175177-1517178554-2-10073714924173896616 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=1517178553; b=H2IJkH6lYh2Nx65hmicZoBZ+STWreoyjKIrrwCAcwy+EyNh 3XuvDI79pcsumtsC2Ys0yQYH0KcnqGa/gUUGWm6QJtfFAXujfjyMhvgpWrXocE/8 4cR7v2wxuqVh+3ES/dbjvJt9Kwb68waj4i9iKlCKhdw5+5JbivOTBePXG5D2vMLS 9XQUJMHA/dkN5lZ9CrQQXTP6LNRtLBcQvCjgfDGMcN9dArJWmVMN5Hesw6A/CWqx bD7Xz1w38lppyJxjvjIucQx/gZTQSQR5HTPHD+Ac2jN7stGIb2BYvmroux15HRWg jQSxGd3gc6Z/ZPmlcsEe2+yXNJyeK7iVern4wqg== 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=1517178553; bh=UVy6kZ TmPlGORKBynUYFK24ZzquI8HQFvANgL25Lekw=; b=J4U2yEXxw0eS0+VLvLmrr+ isL5YHoKdRMOz59eEGPDUuCZEpvMbpwCee8ntcFpz032Uu8Yxu/4qqUV+XN0It2c HtzbgvjSsnYZFzduRsw0d3VECGOoL2DXn65RcbKVmi6dh1BGwXbUJCaNQR4tRkmc 31WAtqraPJ4plciMRP/nKArnajU2mccn1QZjCmfMzbc6Mlavu+ElMUxhayHOeNtt Du2jPAEk3WdLQeoj0kPbqmjUI58we2TgDU1L/qUa+pX/Tefqzg20TYq7xMwLWulC uE4KhYE8zgTF6iDQvmk383OMZ9gcFx5R4OMV47bAtwRc3C9mJDnnfZ6HCun82GKw == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=EkJJNW0c 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: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=EkJJNW0c 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 S1753443AbeA1W3J (ORCPT ); Sun, 28 Jan 2018 17:29:09 -0500 Received: from mail-dm3nam03on0120.outbound.protection.outlook.com ([104.47.41.120]:15392 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753738AbeA1W3G (ORCPT ); Sun, 28 Jan 2018 17:29:06 -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.9 26/49] dccp: CVE-2017-8824: use-after-free in DCCP code Thread-Topic: [PATCH AUTOSEL for 4.9 26/49] dccp: CVE-2017-8824: use-after-free in DCCP code Thread-Index: AQHTmIc8/POr2RvpZEGMG2OLeFBQCQ== Date: Sun, 28 Jan 2018 22:27:52 +0000 Message-ID: <20180128222727.22404-26-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-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;MW2PR2101MB1097;6:ttsujU4wpxpSk6AyPNp/9P+M4c1B60WsQoF/IG3qtyd6eHJY78jvgOYmk8IW8qo9z7itzhOBYJMUY87RVzUalE4woSDFOZ21fDmLUKVAzMUnTDchKp/XJ9viD+vPpHT1dWrmdzOyI+2CbAo3w54kCxRYCzo0+45pHVksen6coNOBUW0siYme+68welDBb9iEDF1kmu8qGrs7GL8WUhwhm9sLTiSvtc8Qf5PZe1CdLMV/BRBODoAWdQUjFBncLMaEusJkk9zkiwrVGHN0gm4z7x3FIKJDUmmTM1boYS8llW9LGPzJmg08w6axBQj7IRDZovBeH0w65Cs0yEBGxkv7nX4F5zD5yNDBsEWx1HUl99PvSwktOa7nlk0tn765lRXi;5:D1KBKrvYlbjNw4YIK0R54Ss8lSfgyEpgXaomrq8JOYnl3rzav1ftnIFKZ/vv1Rj9He/FdtFgeeT4jvS/IOcJPudlMhi1qZQOBqcF3o73gou/JVgez4goG16epawFIQ//dfZf3Hg7ugx1exjWEwe+VAL+Jv4+lJ2o86Cp53x7Ids=;24:suQm6junEdGd9de2Zjih78vKLz0Suik8AhZtwGcXdyVd5Ah8q0gqYV0zqChR5wjsxuxg//G6GbcPtEIcdVUZFGP8RA0oPltwQ/JS8LiH/w8=;7:S/zDzXWQ8cw86LaUHVwghn3s8BwxeaGm7/551fJt/Zks23ePtGphjRTiTy3nEZfRnj35Eaq+9gy1gn0+PhKNpUZlCy6M5JAH2pJn8l4RfOCJZmmlNpjpgq9C5Xlp1SmggwJcykmn2wZHQVM2XUHrENAJ+A8R6nlqWWC7kFi+kkXE7tHDj69nKK2EIIs582A8qdHHfH1Kbdy2AQTa2w77wFZtkFZw7vvHjYKHWsWf608TWkndcSkQPZEaEGsMRZtH x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 8bc41806-4d20-4cbe-5fb4-08d5669e87b6 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1097; x-ms-traffictypediagnostic: MW2PR2101MB1097: 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)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1097;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1097; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(366004)(39380400002)(39860400002)(396003)(376002)(199004)(189003)(72206003)(14454004)(3280700002)(106356001)(4326008)(478600001)(10290500003)(76176011)(102836004)(3660700001)(59450400001)(25786009)(6506007)(105586002)(316002)(6486002)(97736004)(22452003)(186003)(575784001)(99286004)(110136005)(54906003)(107886003)(39060400002)(26005)(86362001)(8676002)(81156014)(2906002)(1076002)(81166006)(68736007)(3846002)(6116002)(305945005)(7736002)(36756003)(86612001)(10090500001)(6512007)(2950100002)(66066001)(5660300001)(53936002)(6666003)(8936002)(6436002)(2501003)(2900100001)(5250100002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1097;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: TvnZz38hE5G/k63/JHwzUuZN8PE4F5UjXC9K6oCsNgQz8IYcMe1X6l9AlY9L32gz+vTd+9Mp2Q/w+NXn6oHsiw== 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: 8bc41806-4d20-4cbe-5fb4-08d5669e87b6 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:52.9392 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1097 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