{"id":806787,"url":"http://patchwork.ozlabs.org/api/patches/806787/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1503956111-36652-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":"<1503956111-36652-21-git-send-email-keescook@chromium.org>","list_archive_url":null,"date":"2017-08-28T21:35:01","name":"[v2,20/30] 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/1503956111-36652-21-git-send-email-keescook@chromium.org/mbox/","series":[{"id":266,"url":"http://patchwork.ozlabs.org/api/series/266/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=266","date":"2017-08-28T21:35:01","name":null,"version":2,"mbox":"http://patchwork.ozlabs.org/series/266/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/806787/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806787/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=\"mU7oE5Nk\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xh55D0g67z9sD9\n\tfor ;\n\tTue, 29 Aug 2017 07:49:19 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751747AbdH1Vf4 (ORCPT );\n\tMon, 28 Aug 2017 17:35:56 -0400","from mail-pf0-f178.google.com ([209.85.192.178]:36088 \"EHLO\n\tmail-pf0-f178.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751514AbdH1Vfa (ORCPT\n\t); Mon, 28 Aug 2017 17:35:30 -0400","by mail-pf0-f178.google.com with SMTP id z87so4665979pfi.3\n\tfor ; Mon, 28 Aug 2017 14:35:29 -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\tw64sm2011072pfi.75.2017.08.28.14.35.22\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 28 Aug 2017 14:35:28 -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=ikl8if2XYp3eCC6lZdQMriiykXxXkjA/kZarOP42c3A=;\n\tb=mU7oE5NkqyDDbWSpYgMBZtIBSbcUZW+67+7BvSpeeKgyXUa2xUHfIYYZp0Fjh7qv/b\n\tNA3URAUPjLhWLVRXkNIhgSpRFRKaUwOo1QQ1lcVGWxNsPk7sEY2s+sVu/Vc9uktG+5nV\n\tZrvAyACa9GQVRWu6drFSg10qIQta6j9ux0hjc=","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=ikl8if2XYp3eCC6lZdQMriiykXxXkjA/kZarOP42c3A=;\n\tb=n4WOSy2/5gD3p7WKbFdA1hJwbcLoyXelSytEQRU151NVTNhkXVAwvWeEkrl1zr6gwP\n\tNYEYPSfeiE3qf5eMHPKZisMy7ceuDv9QFm6DqizTgz1TwJIOW4dNGfeHs8ZhbWC+iEHP\n\t0Vcqi+AqeXLhI5xQ7wrxue2pNsWSIn41R7TaZo6MO0AL9mSza80GPas9lO3Ovyk1AsF3\n\tArzVmM903FNCf/jXBcrDJckJSLr2M/NkCyhIXxtxFZ2SfY5QnEyAPuP3B17Gh7u+RK+N\n\tgpiGGhB8WG5WAGmXA3GTS7sZisUrFUcQm2uswHypYXapr0/cl9f9bEetgqTaeMfdoKJ6\n\tPCxA==","X-Gm-Message-State":"AHYfb5hJd7hTMx3rqTCz8CL5NIiIO2rfBmNx2FpUsVscECkeWeh21roE\n\tjpf4AMZrvwFSJt7V","X-Received":"by 10.98.84.194 with SMTP id i185mr1844362pfb.103.1503956129547; \n\tMon, 28 Aug 2017 14:35:29 -0700 (PDT)","From":"Kees Cook ","To":"linux-kernel@vger.kernel.org","Cc":"Kees Cook , David Windsor ,\n\tDmitry Tarnyagin ,\n\t\"David S. Miller\" , netdev@vger.kernel.org,\n\tlinux-mm@kvack.org, kernel-hardening@lists.openwall.com","Subject":"[PATCH v2 20/30] caif: Define usercopy region in caif proto slab\n\tcache","Date":"Mon, 28 Aug 2017 14:35:01 -0700","Message-Id":"<1503956111-36652-21-git-send-email-keescook@chromium.org>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503956111-36652-1-git-send-email-keescook@chromium.org>","References":"<1503956111-36652-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: Dmitry Tarnyagin \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":["v2","20/30"]}