From patchwork Tue Oct 13 17:18:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1381677 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C9j2V6nTcz9sVL for ; Wed, 14 Oct 2020 04:19:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729399AbgJMRTJ (ORCPT ); Tue, 13 Oct 2020 13:19:09 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60026 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388221AbgJMRTB (ORCPT ); Tue, 13 Oct 2020 13:19:01 -0400 Received: from mail-ed1-f71.google.com ([209.85.208.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kSNww-0004CJ-Vu for netdev@vger.kernel.org; Tue, 13 Oct 2020 17:18:59 +0000 Received: by mail-ed1-f71.google.com with SMTP id m10so132919edj.3 for ; Tue, 13 Oct 2020 10:18:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SpXSDSdlRFb9ggkqiY6j3lhSsXlTf+Fbt8H5fRXb3p0=; b=ZFnw8QVInvt6b+3h3QzHpspWVCaoD6vsvxhQG0KeQa8OdK9Ym/V3YOD4gu+KGU9jc5 8rpfFfVr7jg0iy4l4a79OlDT0WNd03FRzTHeATYRq15UzLl7qfLOsO8SUxPflEBvNgl1 Ay5DbGT3L5rmO9Yw07jczg/S8QupEc3DYMMxwKV4qNXWnxUs7AROvGyPuq8QyjMVH8b/ QNjCRd/4I8OlVqFlFCFPoWXF0GM5537bJPdaLyjxrs55ffeAtHsJmC9wX3rtoruvkE7w kdeXlvFJVUoDB1WSPtco4lnbfS/ugaG1Yk27mbfyEF3TWvvLUHvuCRf4C/b5c6RmzNGd MN8A== X-Gm-Message-State: AOAM532RCOwIiLqUWTzL5JqdvauZtzTp4JqFfAUCwkJGekp9NivFdsNb Q7LLLLDnmzW3soPd23LqAqR4Ywn9o0rBmd3EFpseqOvAgcV4QHSu+HlAp3XITyWIpUxF+XenkhX /bgfp2mydNjqwZC4nRXeL2nRH6ZF4lUiXWw== X-Received: by 2002:a17:906:4910:: with SMTP id b16mr763229ejq.546.1602609537606; Tue, 13 Oct 2020 10:18:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3NuZ4q11/DfqCThTBhZ0g6qFgOjTVcNSF/1wGkdeI6EkcYetu/CBb+wZODe17xtTC7wk0Gg== X-Received: by 2002:a17:906:4910:: with SMTP id b16mr763142ejq.546.1602609536787; Tue, 13 Oct 2020 10:18:56 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:4640:10c0:6cbe:6d37:31ed:e54b]) by smtp.gmail.com with ESMTPSA id g9sm192776edv.81.2020.10.13.10.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 10:18:56 -0700 (PDT) From: Kleber Sacilotto de Souza To: netdev@vger.kernel.org Cc: Gerrit Renker , "David S. Miller" , Jakub Kicinski , Thadeu Lima de Souza Cascardo , "Gustavo A. R. Silva" , "Alexander A. Klimov" , Kees Cook , Eric Dumazet , Alexey Kodanev , dccp@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] Revert "dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()" Date: Tue, 13 Oct 2020 19:18:49 +0200 Message-Id: <20201013171849.236025-3-kleber.souza@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201013171849.236025-1-kleber.souza@canonical.com> References: <20201013171849.236025-1-kleber.souza@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thadeu Lima de Souza Cascardo This reverts commit 2677d20677314101293e6da0094ede7b5526d2b1. This fixes an issue that after disconnect, dccps_hc_tx_ccid will still be kept, allowing the socket to be reused as a listener socket, and the cloned socket will free its dccps_hc_tx_ccid, leading to a later use after free, when the listener socket is closed. This addresses CVE-2020-16119. Fixes: 2677d2067731 (dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()) Reported-by: Hadar Manor Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Kleber Sacilotto de Souza Acked-by: Richard Sailer --- net/dccp/proto.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 6d705d90c614..359e848dba6c 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -279,7 +279,9 @@ int dccp_disconnect(struct sock *sk, int flags) 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 = NULL; + dp->dccps_hc_tx_ccid = NULL; __skb_queue_purge(&sk->sk_receive_queue); __skb_queue_purge(&sk->sk_write_queue);