{"id":816504,"url":"http://patchwork.ozlabs.org/api/patches/816504/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-20-git-send-email-keescook@chromium.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505940337-79069-20-git-send-email-keescook@chromium.org>","list_archive_url":null,"date":"2017-09-20T20:45:25","name":"[v3,19/31] ip: Define usercopy region in IP proto slab cache","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"c751b086183860d3a92f4fff7a33be227ca649fc","submitter":{"id":10641,"url":"http://patchwork.ozlabs.org/api/people/10641/?format=json","name":"Kees Cook","email":"keescook@chromium.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-20-git-send-email-keescook@chromium.org/mbox/","series":[{"id":4231,"url":"http://patchwork.ozlabs.org/api/series/4231/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4231","date":"2017-09-20T20:45:22","name":"Hardened usercopy whitelisting","version":3,"mbox":"http://patchwork.ozlabs.org/series/4231/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816504/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816504/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"mAjx/Ybo\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyBqx33VPz9s7m\n\tfor ;\n\tThu, 21 Sep 2017 06:56:45 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751904AbdITU4n (ORCPT );\n\tWed, 20 Sep 2017 16:56:43 -0400","from mail-pg0-f49.google.com ([74.125.83.49]:47947 \"EHLO\n\tmail-pg0-f49.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752162AbdITUxA (ORCPT\n\t); Wed, 20 Sep 2017 16:53:00 -0400","by mail-pg0-f49.google.com with SMTP id d8so2343396pgt.4\n\tfor ; Wed, 20 Sep 2017 13:53:00 -0700 (PDT)","from www.outflux.net\n\t(173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133])\n\tby smtp.gmail.com with ESMTPSA id\n\tr12sm8493236pgp.81.2017.09.20.13.52.51\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 20 Sep 2017 13:52:52 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=EOwr2rTxwJiOCbg0Gnxsy3JBM6RmWFP7NtvUzQz1tIM=;\n\tb=mAjx/YboMy3OUDGrpYxsjZGHhzCrzioTLc6rZaJW0BA4yHpTmYZt9a4jdH+aeRl7jv\n\tDL/kvOZKUo8flEemAjdraowvqKuIrFMivd0gVBXl3w46+RvVCdlkfwdPAt5VQIxOnfls\n\tTiakffXZ5BsT2g9yfeQx85yk/dtyZ5Oua2204=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=EOwr2rTxwJiOCbg0Gnxsy3JBM6RmWFP7NtvUzQz1tIM=;\n\tb=pgCB6uMz0XXkpML6wYcvSXy0QGWAPllhDU1oiNgsmF6s15LYnuIvjuFyX+49HpyrWZ\n\tXXD41rPkuEcnXOjUrZ3vNbsA2TTcq/MhufewR00kfXtq6OTBoGaHjkANBA2+3fbukTmS\n\tKXO3F4M3CLr9k0Cw1hviSCGP7ToKmXVwTe/QJnyyzB6g9e8PazOrH3gx62qb8M6+ROTH\n\tHfg7uKXCTrZoVkpG59Gu6Js39YGNYZjLeXuNOuhjL3nADtjXYAcGweUNjt7Qi4U03M1f\n\tWrMTw69LuUSx+d9ElKFL+Fy48qhxlcIeOABCIr/d2GQR2qYxw1n+7R8hcUQF/iHg83k+\n\tzOIw==","X-Gm-Message-State":"AHPjjUhwuSJ23k4vbBr8k21FI6RjpJ+ycbpGjkYLOIr6HirivGXvgFPR\n\tKYS5H9i7330IkAYGSYtSN+nJde/BLgI=","X-Google-Smtp-Source":"AOwi7QDr1HdaAckjNWKGoyNxnXmclXZ4faKgN6R5hoWR54aWYoZmpmNgX8+Nj24OC+kxF9gzsdF1fA==","X-Received":"by 10.101.70.138 with SMTP id h10mr3459527pgr.8.1505940780365;\n\tWed, 20 Sep 2017 13:53:00 -0700 (PDT)","From":"Kees Cook ","To":"linux-kernel@vger.kernel.org","Cc":"Kees Cook , David Windsor ,\n\t\"David S. Miller\" ,\n\tAlexey Kuznetsov ,\n\tHideaki YOSHIFUJI ,\n\tnetdev@vger.kernel.org, linux-fsdevel@vger.kernel.org,\n\tlinux-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":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: David Windsor \n\nThe ICMP filters for IPv4 and IPv6 raw sockets need to be copied to/from\nuserspace. In support of usercopy hardening, this patch defines a region\nin the struct proto slab cache in which userspace copy operations are\nallowed.\n\nexample usage trace:\n\n net/ipv4/raw.c:\n raw_seticmpfilter(...):\n ...\n copy_from_user(&raw_sk(sk)->filter, ..., optlen)\n\n raw_geticmpfilter(...):\n ...\n copy_to_user(..., &raw_sk(sk)->filter, len)\n\n net/ipv6/raw.c:\n rawv6_seticmpfilter(...):\n ...\n copy_from_user(&raw6_sk(sk)->filter, ..., optlen)\n\n rawv6_geticmpfilter(...):\n ...\n copy_to_user(..., &raw6_sk(sk)->filter, len)\n\nThis region is known as the slab cache's usercopy region. Slab caches can\nnow check that each copy operation involving cache-managed memory falls\nentirely within the slab's usercopy region.\n\nThis patch is modified from Brad Spengler/PaX Team's PAX_USERCOPY\nwhitelisting code in the last public patch of grsecurity/PaX based on my\nunderstanding of the code. Changes or omissions from the original code are\nmine and don't reflect the original grsecurity/PaX code.\n\nSigned-off-by: David Windsor \n[kees: split from network patch, provide usage trace]\nCc: \"David S. Miller\" \nCc: Alexey Kuznetsov \nCc: Hideaki YOSHIFUJI \nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n net/ipv4/raw.c | 2 ++\n net/ipv6/raw.c | 2 ++\n 2 files changed, 4 insertions(+)","diff":"diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c\nindex 33b70bfd1122..1b6fa4195ac9 100644\n--- a/net/ipv4/raw.c\n+++ b/net/ipv4/raw.c\n@@ -970,6 +970,8 @@ struct proto raw_prot = {\n \t.hash\t\t = raw_hash_sk,\n \t.unhash\t\t = raw_unhash_sk,\n \t.obj_size\t = sizeof(struct raw_sock),\n+\t.useroffset\t = offsetof(struct raw_sock, filter),\n+\t.usersize\t = sizeof_field(struct raw_sock, filter),\n \t.h.raw_hash\t = &raw_v4_hashinfo,\n #ifdef CONFIG_COMPAT\n \t.compat_setsockopt = compat_raw_setsockopt,\ndiff --git a/net/ipv6/raw.c b/net/ipv6/raw.c\nindex e4462b0ff801..041d1cd5e774 100644\n--- a/net/ipv6/raw.c\n+++ b/net/ipv6/raw.c\n@@ -1268,6 +1268,8 @@ struct proto rawv6_prot = {\n \t.hash\t\t = raw_hash_sk,\n \t.unhash\t\t = raw_unhash_sk,\n \t.obj_size\t = sizeof(struct raw6_sock),\n+\t.useroffset\t = offsetof(struct raw6_sock, filter),\n+\t.usersize\t = sizeof_field(struct raw6_sock, filter),\n \t.h.raw_hash\t = &raw_v6_hashinfo,\n #ifdef CONFIG_COMPAT\n \t.compat_setsockopt = compat_rawv6_setsockopt,\n","prefixes":["v3","19/31"]}