From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517178726-2-1178545088621638796 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 unknown, 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=1517178726; b=W+J8hunhcJ5o0cjSnucZbWEiAuZ1Tj5Y3butexefRMP9xIl 1tQNVWx1BgfFaQPitfwi4OJv4PA1XLZvTcfkG9hyWY+OmzvWPHBynFHsVMkRvi0I aA+5BqnvYVECqqWdoG7E//am6tlpFlBUAl0+MYEMvXctFLKD82pHhs6IT20HJv0g ezohQ/fmKBpPCENEJGJ5f/am6WGn84jSQI2MCaXTVORQzUSICdP9LgzQkgZkv7Vt z4lDCbrANYmMHyb30bME1jjnudayzQCaXb42/ztYE3j11+R1c/1qUDnpRKtsznpg N49nExA/3v7jcu551u+LgXKgkdDGiB5OZ/PdZWw== 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=1517178726; bh=RF57oV I2eWNO/V3C/1XMDFkMYpbZpuxN2bsO0m02dF0=; b=rJsn78tJCOT1Y/6HH+uQGx y/CZQMpXQxtOEGYnHgk33C3rdsY58hqEP63WnUA5VTytP74QdSE3UVWOh/lQlKnr y/qDgCRRAxmHSzw1C2KNseYWd4UTRgJeCeBPZOGXFneUOO+PZXFz8fz9fYwlZEij wMDoSdDv+n2un7hzVyjJ8N3+0SSoUHOYTj2tv6Gr7d8+sH9UhMWVOsRx6UjUGri/ snQsCvl8gCRSPeVkQ7F7yjqFXlQ3z5IzAxb0otmgSF63PFTV1//T9j3i9GbJAFgQ izFEbEPaFHY9NfODB4hR31vF2A3LQ7HFRM5lrHSO9SyQdN/3neQvRLKOPtAo761g == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=CzF7+u+P 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: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=CzF7+u+P 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 S1753465AbeA1Wam (ORCPT ); Sun, 28 Jan 2018 17:30:42 -0500 Received: from mail-bl2nam02on0093.outbound.protection.outlook.com ([104.47.38.93]:45074 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932630AbeA1Wai (ORCPT ); Sun, 28 Jan 2018 17:30:38 -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 3.18 14/25] dccp: CVE-2017-8824: use-after-free in DCCP code Thread-Topic: [PATCH AUTOSEL for 3.18 14/25] dccp: CVE-2017-8824: use-after-free in DCCP code Thread-Index: AQHTmIeDCcp7PhAINUC7YYrPN9keug== Date: Sun, 28 Jan 2018 22:29:52 +0000 Message-ID: <20180128222931.7781-14-alexander.levin@microsoft.com> References: <20180128222931.7781-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222931.7781-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;MW2PR2101MB1098;6:LxMJcuI68xQYHoog5yrkOR60aUkWwmPeeEmWVmgw7NjmW120DykYdeejyCGn64Cg3bJWJbNgNjxPKkQGaD78SkqFdegQfSHoaMLc+KfeCNcYt+yMrY9R09xt/I0jeX9qSyK1Sr2LVh+/XzgaoWTJB4/nOsPRU9/b2H5c5Ih86bvBYF/E4zlwaYJX46iBCV9Ke/xtvkgIc4pBb//dqaOXn/J2bTCXfdcbb7qHZh9y0XczHdMnuvJASPIgUBLP8GIOU6fB6pjlU7ZHxQZk6DAvcXvkJTSnRu8PlV9T/WUG6hbR5HtkE7XQVdGjF91nknAgPjeEgcY+FstRJzwyaqpkztJpYldClcUNG0Kar/annUXsoTUu3EYY2SrsS+uScULi;5:wT6n0KzdIIv0BDCjhuxnrZq9N1KMcbnug8nUI9qY44iSIw5tOuo2eZNiG0xSfSjbyqS/ZuqdkgrxNCj+Ja/T8HR4EFNWm08D/1S/0uCY7j0QPF8oxzDOsy2yfOHAFzgNWuKKlewDIW+s2LDATkNPtGyfFlprzgkm8iOV4gdJ5Mw=;24:IV4DsF24ftBp9+1u+jcKszVdaQwYb3WHTFeZtEHB0uhi+9jkEbEUp7k68Yicdlz/k70WbIpDsrJi0cvR4X5F8TdBS07xYLaro0+n92g1yCM=;7:KoTF/oCbgKmFfPxr5N4jDiEUlLx2VpMvSyYiw5EVAI1tXb1ZUijDHrZKMMKJyW4Owd4iXUVUEark+ZQ0J06/Q6KO3OqNkU8ioNpXGAggSLZ8xWhyY+nyzUwvLWGOh10snz1PiGEmVokw/j9QRKk43HYAIad81iKWaDqKTFXXG0Nv+x82e+E4u0KgdOv3KQgFnmIFoB830PFOJizgQj0lV6TOggU1fxzJZZIaHBxA7pTDnqMGCRYhxhaaDSj+vx9w x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 08dc2615-2243-4f23-4343-08d5669ebedf x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1098; x-ms-traffictypediagnostic: MW2PR2101MB1098: 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:MW2PR2101MB1098;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1098; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(346002)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(54906003)(7736002)(66066001)(305945005)(316002)(72206003)(106356001)(2950100002)(6666003)(478600001)(10290500003)(6506007)(97736004)(2906002)(105586002)(59450400001)(25786009)(107886003)(5250100002)(8676002)(110136005)(14454004)(5660300001)(2501003)(22452003)(2900100001)(81156014)(68736007)(6436002)(8936002)(53936002)(10090500001)(81166006)(99286004)(102836004)(3660700001)(36756003)(3280700002)(86612001)(575784001)(3846002)(6116002)(86362001)(1076002)(4326008)(26005)(39060400002)(76176011)(6512007)(6486002)(186003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1098;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: VH/i8L0cJiVSH1dXjp0t9ABMLvIM8EXdMlpdNra8JwMXZ3cy3emy/vJwEDC5yTBLewmh1RBmlJsSO6eVBnIQrw== 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: 08dc2615-2243-4f23-4343-08d5669ebedf X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:29:52.6171 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1098 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 e1bc9d52c016..dad5493c7c5a 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