{"id":816483,"url":"http://patchwork.ozlabs.org/api/patches/816483/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-21-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-21-git-send-email-keescook@chromium.org>","list_archive_url":null,"date":"2017-09-20T20:45:26","name":"[v3,20/31] caif: Define usercopy region in caif proto slab cache","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"394021791c06427cfcbbe2d6311acbc5d43e64df","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-21-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/816483/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816483/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=\"Gwe6hX+2\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyBdD64jTz9s4s\n\tfor ;\n\tThu, 21 Sep 2017 06:47:28 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752041AbdITUq5 (ORCPT );\n\tWed, 20 Sep 2017 16:46:57 -0400","from mail-pg0-f43.google.com ([74.125.83.43]:53599 \"EHLO\n\tmail-pg0-f43.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751930AbdITUqO (ORCPT\n\t); Wed, 20 Sep 2017 16:46:14 -0400","by mail-pg0-f43.google.com with SMTP id j70so2326935pgc.10\n\tfor ; Wed, 20 Sep 2017 13:46:14 -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\tj14sm8379424pgs.15.2017.09.20.13.46.04\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 20 Sep 2017 13:46:08 -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=3rcTq9qKe3syswrU9FV9vxWUfCoZoHovIBXXZeEnCUU=;\n\tb=Gwe6hX+2V6YzhjyyG3Ul7QBvUBTlls0iOGWH94n1WTSGdugtZkyg2/5qAZnZhYLXMi\n\tDEQrRs0Rj6kOq3ZOsG/BO4arAnJojrbBSkQrsYeqMjP5GqDDeCtgWG9hhDCcHOkS1vO5\n\tOOg2GQRzw5UgnhSTj1aBHYfEHZJvwDJ3/12zM=","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=3rcTq9qKe3syswrU9FV9vxWUfCoZoHovIBXXZeEnCUU=;\n\tb=HEJrZ80zmxjXZ4AF7rqoYXIk7DFsuuVKYB2kkfadHbjeI1IC4i9TssnSWa2PtAjESC\n\tkAmHN5RVbagi2BSQ+Ys30mBJB0aMYUlnKReWvptXA4ArulFBr61kpioTjuiOnyzQekPn\n\tcnfvIkYnmLsmh8J012KVLBLJnN6AF58GWKNr3IUl5NDXfrlIqjTXfu6RsgaaGlpiXz6w\n\tSU9Er83TuTkgSRCAdl5dU3oLqHmVItNl8llUIDR0JztJCb5CZAjcyl6ZJ++F5lGSiMYq\n\tlC+OHwwwklRwBw+f8nqTtXX1eSMx5cseWTecp+NnV34fdMGyRC/TFg2x59ZHBV9HXhyk\n\ta3ww==","X-Gm-Message-State":"AHPjjUhgN6xCwrOQN/yA9HMWPcqUcZDgqzZbh5h6FNZCWk5qgJzfP+ci\n\tvEWixA4j/yOOZoP1sEu8EOA7WQ==","X-Google-Smtp-Source":"AOwi7QBeF4XE3RC/jm1ungl235aGF2O8qubaS7Hhsvw6JXmDKu0o1gUJa6HnDsW7w11pArmSTLNEHQ==","X-Received":"by 10.99.3.4 with SMTP id 4mr3448567pgd.203.1505940374030;\n\tWed, 20 Sep 2017 13:46:14 -0700 (PDT)","From":"Kees Cook ","To":"linux-kernel@vger.kernel.org","Cc":"Kees Cook , David Windsor ,\n\t\"David S. Miller\" , netdev@vger.kernel.org,\n\tlinux-fsdevel@vger.kernel.org, linux-mm@kvack.org,\n\tkernel-hardening@lists.openwall.com","Subject":"[PATCH v3 20/31] caif: Define usercopy region in caif proto slab\n\tcache","Date":"Wed, 20 Sep 2017 13:45:26 -0700","Message-Id":"<1505940337-79069-21-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 CAIF channel connection request parameters 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/caif/caif_socket.c:\n setsockopt(...):\n ...\n copy_from_user(&cf_sk->conn_req.param.data, ..., ol)\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: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n net/caif/caif_socket.c | 2 ++\n 1 file changed, 2 insertions(+)","diff":"diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c\nindex 632d5a416d97..c76d513b9a7a 100644\n--- a/net/caif/caif_socket.c\n+++ b/net/caif/caif_socket.c\n@@ -1032,6 +1032,8 @@ static int caif_create(struct net *net, struct socket *sock, int protocol,\n \tstatic struct proto prot = {.name = \"PF_CAIF\",\n \t\t.owner = THIS_MODULE,\n \t\t.obj_size = sizeof(struct caifsock),\n+\t\t.useroffset = offsetof(struct caifsock, conn_req.param),\n+\t\t.usersize = sizeof_field(struct caifsock, conn_req.param)\n \t};\n \n \tif (!capable(CAP_SYS_ADMIN) && !capable(CAP_NET_ADMIN))\n","prefixes":["v3","20/31"]}