From patchwork Tue Oct 13 17:18:47 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: 11835653 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4DE8C433E7 for ; Tue, 13 Oct 2020 17:18:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C11A2534C for ; Tue, 13 Oct 2020 17:18:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729217AbgJMRS6 (ORCPT ); Tue, 13 Oct 2020 13:18:58 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:60002 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729016AbgJMRS5 (ORCPT ); Tue, 13 Oct 2020 13:18:57 -0400 Received: from mail-ej1-f69.google.com ([209.85.218.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kSNwt-0004Ao-64 for netdev@vger.kernel.org; Tue, 13 Oct 2020 17:18:55 +0000 Received: by mail-ej1-f69.google.com with SMTP id k23so51016ejx.0 for ; Tue, 13 Oct 2020 10:18:55 -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:mime-version :content-transfer-encoding; bh=z/aFQntV5BEuLQOersUesePgf9vJOqG7JddMqo5PmOE=; b=nOWN8mKv8Tm68fU6cgfMO0xforRBmAmP294NmpUueiKyEK3gPfFK06ITNYLx5W2T9x xQ1VM5vl2xpIgI1g8KGjfqM1LyDpzWVaVo/RXKLYiNXMU/788p2RfrW7dxjBRmD5//xZ cYZANr7J5bJ2kaAOaPkCp+OEXZY/aaUsry3urWrGqyoVAQ171ilCOG5su3fv/HuZiTFK 9z8wQL6WZ90c62zqS0o7iPhD1GSAIXUlMm+D1I4wLlzZIRUBFYjNzeCydgZ+1VHEgpZc 63dte8tQyaVPsCcudWglsDrB5PSlGvbA1qx+Ugq2DRCvRwZi9adMNcpEn8KLQhgSXVWF 9Bsw== X-Gm-Message-State: AOAM531qzQvRSKyu7IZj4ucXOYalwckM5aZQiNpWYm6DMZCMn6nZmnU+ AJlLYo+D51IhysXK2GAynb+G54ArzCFRJurIH28/AzHduj0mIOhd26uJ89vMuBRcZzj+4+A9iYv 9ui36qYHPxYntVdZxwyV/gD1iiI7qFLgHzg== X-Received: by 2002:a17:906:aecf:: with SMTP id me15mr781855ejb.423.1602609534371; Tue, 13 Oct 2020 10:18:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9pvtKKURjp2ug1Z4ZJd2hmab2EjAkSsdGoOmFWxQUGirumG8Fv5V+n0z6JDMIK5vb6vlaRg== X-Received: by 2002:a17:906:aecf:: with SMTP id me15mr781824ejb.423.1602609534064; Tue, 13 Oct 2020 10:18:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 10:18:53 -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 0/2] net: dccp: fix structure use-after-free Date: Tue, 13 Oct 2020 19:18:47 +0200 Message-Id: <20201013171849.236025-1-kleber.souza@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patchset addresses the following CVE: CVE-2020-16119 - DCCP CCID structure use-after-free Hadar Manor reported that by reusing a socket with an attached dccps_hc_tx_ccid as a listener, it will be used after being released, leading to DoS and potentially code execution. The first patch moves the ccid timers to struct dccp_sock to avoid its use-after-free, the second patch reverts 2677d2067731 "dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()" that's not needed anymore and would cause another use-after-free. Thadeu Lima de Souza Cascardo (2): dccp: ccid: move timers to struct dccp_sock Revert "dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()" include/linux/dccp.h | 2 ++ net/dccp/ccids/ccid2.c | 32 +++++++++++++++++++------------- net/dccp/ccids/ccid3.c | 30 ++++++++++++++++++++---------- net/dccp/proto.c | 2 ++ 4 files changed, 43 insertions(+), 23 deletions(-)