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: 9962549 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 C1B1760208 for ; Wed, 20 Sep 2017 20:55:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3ED229210 for ; Wed, 20 Sep 2017 20:55:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A88B62920C; Wed, 20 Sep 2017 20:55:16 +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=-2.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, URIBL_BLACK autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id 204B32920C for ; Wed, 20 Sep 2017 20:55:13 +0000 (UTC) Received: (qmail 1944 invoked by uid 550); 20 Sep 2017 20:53:22 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 1538 invoked from network); 20 Sep 2017 20:53:12 -0000 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=Jehk+W5JVTyCe3EF8xYsvYPPQI2K7F8ecb9fB3YDHWH5YCHr4YWdoD2APg39dfR/Im E9yM4nKmuhdvrWFKUSe8w7IoHWZ9mcNUzwQWGG1azndqKaJgNekQJXJIbWxft6ER/4YJ Eq/LTgMfpiwG0tHiD4TCmI1OFYN7X8IZuf2ADT+k+kKG/AUnS5iy9qaX8f5qR0QZm6KI u2Pm8JTyreyfjVP5TMYZxu/SqH1lIRvPIosH+7HQZjVqTK7JafeezJyiO8LmYRlBoTEL Uj21QHHohuSIG/ufXBqeS65olf5eOv9Kx9U8K86ZrKoXnSutoAwBiigLkhAEzSxtRKoK axMw== X-Gm-Message-State: AHPjjUgJw+JUzLc7G2kltQ9H2g6r8hd5AcejkNpZBUG2exANN7xqPukx MvlrjGn0SP9jWTwI0grOmS+wGQ== 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) 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 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> Subject: [kernel-hardening] [PATCH v3 19/31] ip: Define usercopy region in IP proto slab cache 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,