From patchwork Tue Jul 24 08:40:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 948255 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZWzM3ZM6z9s4Z; Tue, 24 Jul 2018 18:41:01 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fhssG-0002o6-DG; Tue, 24 Jul 2018 08:40:52 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fhssF-0002nh-5J for kernel-team@lists.ubuntu.com; Tue, 24 Jul 2018 08:40:51 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fhssE-0007kJ-Sx for kernel-team@lists.ubuntu.com; Tue, 24 Jul 2018 08:40:50 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 0/2] [SRU][Trusty] Fix for CVE-2017-6345 Date: Tue, 24 Jul 2018 10:40:48 +0200 Message-Id: <1532421650-17137-1-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" https://people.canonical.com/~ubuntu-security/cve/2017/CVE-2017-6345.html Patch 01 is a clean cherry-pick and correspond to the upstream fix. Patch 02 is a partial backport, and contains a prerequisite (sock_efree()). Instead of importing sock_efree() i could have used sock_edemux() since the two behave similarly, except when the passed socket is a TCP socket in the TCP_TIME_WAIT state. But since the TCP states are represented using an enum and the field sk_state is reused by every protocol, i preferred to avoid introducing a subtle mistake and use the original sock_efree() function. Eric Dumazet (1): net/llc: avoid BUG_ON() in skb_orphan() Paolo Pisati (1): UBUNTU: SAUCE: import sock_efree() include/net/sock.h | 1 + net/core/sock.c | 6 ++++++ net/llc/llc_conn.c | 3 +++ net/llc/llc_sap.c | 3 +++ 4 files changed, 13 insertions(+) Acked-by: Stefan Bader Acked-by: Khalid Elmously