From patchwork Wed Sep 20 20:45:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9962563 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 3D4A660208 for ; Wed, 20 Sep 2017 20:56:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3076B29239 for ; Wed, 20 Sep 2017 20:56:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 256942923D; Wed, 20 Sep 2017 20:56:49 +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 A447C29239 for ; Wed, 20 Sep 2017 20:56:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751826AbdITU4n (ORCPT ); Wed, 20 Sep 2017 16:56:43 -0400 Received: from mail-pg0-f42.google.com ([74.125.83.42]:53016 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752163AbdITUxA (ORCPT ); Wed, 20 Sep 2017 16:53:00 -0400 Received: by mail-pg0-f42.google.com with SMTP id i195so2335500pgd.9 for ; Wed, 20 Sep 2017 13:53:00 -0700 (PDT) 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=EOwr2rTxwJiOCbg0Gnxsy3JBM6RmWFP7NtvUzQz1tIM=; b=mAjx/YboMy3OUDGrpYxsjZGHhzCrzioTLc6rZaJW0BA4yHpTmYZt9a4jdH+aeRl7jv DL/kvOZKUo8flEemAjdraowvqKuIrFMivd0gVBXl3w46+RvVCdlkfwdPAt5VQIxOnfls TiakffXZ5BsT2g9yfeQx85yk/dtyZ5Oua2204= 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=EOwr2rTxwJiOCbg0Gnxsy3JBM6RmWFP7NtvUzQz1tIM=; b=XihWj6oX/vVJU/UxO7q1lFmgnrhjjneYQaD+IQSL9HCqwWddE/0HlTI1t7+UXObYY1 7CJc+HLnVQPbjYvZBSpE57ATGPfB6MyJkFnjJcleoJqpJ1cjH/PsQCn7udbEjQlMrTX0 KrxkGwdrkj25LXeAnlD6Wdr0oEhNdm8xlz/0lkmOvkW/LD7hiyemHUEl0fC/d2KD81S6 AgAnUKESPVJ+9MOGgFdB/0HboJdh4GwNzlUAFRCPfhJdAQWGUpCOT1yl9a2mDaeu8z3X 69cl5t/0w99qRG9p0XbOMQCdXR85Zdw1kD65B/ZRwTTjf9vzuGd95vOratdO88xCTjhN hGxA== X-Gm-Message-State: AHPjjUjSskPZaq/7iu6trrM08QIfv10sdtlcK6ZtvvhMGefXQyYz32/E daWq9xLmYwrrdc1AIP29zgvUTQ== X-Google-Smtp-Source: AOwi7QDr1HdaAckjNWKGoyNxnXmclXZ4faKgN6R5hoWR54aWYoZmpmNgX8+Nj24OC+kxF9gzsdF1fA== X-Received: by 10.101.70.138 with SMTP id h10mr3459527pgr.8.1505940780365; Wed, 20 Sep 2017 13:53:00 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id r12sm8493236pgp.81.2017.09.20.13.52.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 13:52:52 -0700 (PDT) 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, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Subject: [PATCH v3 19/31] ip: Define usercopy region in IP proto slab cache Date: Wed, 20 Sep 2017 13:45:25 -0700 Message-Id: <1505940337-79069-20-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505940337-79069-1-git-send-email-keescook@chromium.org> References: <1505940337-79069-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 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 e4462b0ff801..041d1cd5e774 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -1268,6 +1268,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,