From patchwork Thu Jan 11 02:02:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10156483 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 06AAB605BA for ; Thu, 11 Jan 2018 02:05:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA388203B9 for ; Thu, 11 Jan 2018 02:05:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC89E286E0; Thu, 11 Jan 2018 02:05:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, URIBL_BLACK autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EDF0286E2 for ; Thu, 11 Jan 2018 02:05:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753990AbeAKCEY (ORCPT ); Wed, 10 Jan 2018 21:04:24 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:38266 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753833AbeAKCDf (ORCPT ); Wed, 10 Jan 2018 21:03:35 -0500 Received: by mail-pg0-f68.google.com with SMTP id t67so1607551pgc.5 for ; Wed, 10 Jan 2018 18:03:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aUFMhz/KGzkgUG61AiDnvDa/DuksW6igaYCzXCSgYSw=; b=BMtK1bmqrUKOiyk4fkdTCA81g9+Wct7eXaegQbRbS3GsxQ948E5BFrQnxBt9BW6NWA fcbUwrGKEtoCJQnIlRkgPGyT+BK8LBSaJRZc67/dLoLXPW16k5ualAB9t6fEBjtY3r0Z ku1y8gZXwgHOlsAa6dXY1RKfOu6jkMAMg8Vbg= 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; bh=aUFMhz/KGzkgUG61AiDnvDa/DuksW6igaYCzXCSgYSw=; b=WFq9TfmfeOe8ubU4ZMZnK27DC4bb5yCD1sVAswWhFax83MebKKwitlBeWGdKaOZER7 Iy8/3czCSDU5+rSLPkLIKjkHX8gYR9AP2SFz4ZBQKTUFzWyi5VOctylEuPMu+JwpZVAR XpbmTgQzYjdgx1HS/XswyLCWR3w9Ci1Xq5a3h3D7/fVX+SqSRFLv9XShTuz4oUIsJwef PVGZp6TmbOrTnuXWG7B28jGC6djA8cPoIcRpoWW+8mnd5+wtqznB5n9RgzX3Nm9PDr8u w84sWaK7VoAMegT5LSc4bAKo+xund+vtbS9XCnfhS3TGDjDULTdkAVePjuU6SFpasYbB xf+Q== X-Gm-Message-State: AKGB3mK0H6BeFQmkx5UUV7JknYRNkGsfLZK6bP03MBZyHKKBPPZNftWM cdi12nOyBF28Fk3rZR6goMtQBvaFLeE= X-Google-Smtp-Source: ACJfBotS+pIeNe4kjgeA0rTE+sDHRmmU5x4y1UDAhtbVGGzGRpzvS34uBBxk7+dOr3SLK9PEkol8VA== X-Received: by 10.98.76.136 with SMTP id e8mr18833677pfj.215.1515636215261; Wed, 10 Jan 2018 18:03:35 -0800 (PST) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id p24sm35622912pfh.170.2018.01.10.18.03.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 18:03:32 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , netdev@vger.kernel.org, Linus Torvalds , Alexander Viro , Andrew Morton , Andy Lutomirski , Christoph Hellwig , Christoph Lameter , Laura Abbott , Mark Rutland , "Martin K. Petersen" , Paolo Bonzini , Christian Borntraeger , Christoffer Dall , Dave Kleikamp , Jan Kara , Luis de Bethencourt , Marc Zyngier , Rik van Riel , Matthew Garrett , linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Subject: [PATCH 24/38] ip: Define usercopy region in IP proto slab cache Date: Wed, 10 Jan 2018 18:02:56 -0800 Message-Id: <1515636190-24061-25-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515636190-24061-1-git-send-email-keescook@chromium.org> References: <1515636190-24061-1-git-send-email-keescook@chromium.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Windsor The ICMP filters for IPv4 and IPv6 raw sockets need to be copied to/from userspace. In support of usercopy hardening, this patch defines a region in the struct proto slab cache in which userspace copy operations are allowed. example usage trace: net/ipv4/raw.c: raw_seticmpfilter(...): ... copy_from_user(&raw_sk(sk)->filter, ..., optlen) raw_geticmpfilter(...): ... copy_to_user(..., &raw_sk(sk)->filter, len) net/ipv6/raw.c: rawv6_seticmpfilter(...): ... copy_from_user(&raw6_sk(sk)->filter, ..., optlen) rawv6_geticmpfilter(...): ... copy_to_user(..., &raw6_sk(sk)->filter, len) This region is known as the slab cache's usercopy region. Slab caches can now check that each dynamically sized copy operation involving cache-managed memory falls entirely within the slab's usercopy region. This patch is modified from Brad Spengler/PaX Team's PAX_USERCOPY whitelisting code in the last public patch of grsecurity/PaX based on my understanding of the code. Changes or omissions from the original code are mine and don't reflect the original grsecurity/PaX code. Signed-off-by: David Windsor [kees: split from network patch, provide usage trace] Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: Hideaki YOSHIFUJI Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook --- net/ipv4/raw.c | 2 ++ net/ipv6/raw.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 33b70bfd1122..1b6fa4195ac9 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -970,6 +970,8 @@ struct proto raw_prot = { .hash = raw_hash_sk, .unhash = raw_unhash_sk, .obj_size = sizeof(struct raw_sock), + .useroffset = offsetof(struct raw_sock, filter), + .usersize = sizeof_field(struct raw_sock, filter), .h.raw_hash = &raw_v4_hashinfo, #ifdef CONFIG_COMPAT .compat_setsockopt = compat_raw_setsockopt, diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 761a473a07c5..08a85fabdfd1 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -1272,6 +1272,8 @@ struct proto rawv6_prot = { .hash = raw_hash_sk, .unhash = raw_unhash_sk, .obj_size = sizeof(struct raw6_sock), + .useroffset = offsetof(struct raw6_sock, filter), + .usersize = sizeof_field(struct raw6_sock, filter), .h.raw_hash = &raw_v6_hashinfo, #ifdef CONFIG_COMPAT .compat_setsockopt = compat_rawv6_setsockopt,