Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/816502/?format=api
{ "id": 816502, "url": "http://patchwork.ozlabs.org/api/patches/816502/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-22-git-send-email-keescook@chromium.org/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "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-22-git-send-email-keescook@chromium.org>", "list_archive_url": null, "date": "2017-09-20T20:45:27", "name": "[v3,21/31] sctp: Define usercopy region in SCTP proto slab cache", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "164aadff4fdcd280fac726de93b5e0321cba2d3e", "submitter": { "id": 10641, "url": "http://patchwork.ozlabs.org/api/people/10641/?format=api", "name": "Kees Cook", "email": "keescook@chromium.org" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-22-git-send-email-keescook@chromium.org/mbox/", "series": [ { "id": 4231, "url": "http://patchwork.ozlabs.org/api/series/4231/?format=api", "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/816502/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/816502/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "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=<UNKNOWN>)", "ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"ICQLYooq\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyBnp0MfCz9s83\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 21 Sep 2017 06:54:54 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752240AbdITUyv (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tWed, 20 Sep 2017 16:54:51 -0400", "from mail-pf0-f177.google.com ([209.85.192.177]:47114 \"EHLO\n\tmail-pf0-f177.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752168AbdITUxB (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Wed, 20 Sep 2017 16:53:01 -0400", "by mail-pf0-f177.google.com with SMTP id u12so2125939pfl.4\n\tfor <netdev@vger.kernel.org>; Wed, 20 Sep 2017 13:53:01 -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\tp88sm10812218pfi.174.2017.09.20.13.52.52\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 20 Sep 2017 13:52:53 -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=fJBCTYrvupc81/kSBPbTUYwbynzllz2b1+/Rc+B9MZ8=;\n\tb=ICQLYooqJJeIN7aSoOC/pYxI3kOF+AwYe7uqAeRUAKWj/tzcJ5z9AoxeiU7S72kgkg\n\t+iFF+bHaGteLNHOW0Wi2Nhh7vXyXK4VrLxpiatpExP7vYnWyBKihQ/goz55xn/ZwALZi\n\t5prk3pXs6vYJ1IYOAkyBbG8NNOsKvEzDLGOno=", "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=fJBCTYrvupc81/kSBPbTUYwbynzllz2b1+/Rc+B9MZ8=;\n\tb=tc1MtJ3mRHmvJb1rGiT7UOrQtZTg2mrv7tpVyja4tpYpe1UPpcc7QyBu2OR6GZhikc\n\ttSykKZF0smgYJnw/u0lWq8DZ5qfUtAwU7TcfhWgiOqsalvOwuW+bSRiSq8j+aWOYvs5i\n\tHbO8VvIIJA8xgqIxq1bedO4iJEnWR4GC3AWXo+Zz97fLb+K+B0PzwT8pLq0apCrKki3r\n\tq0qZ3SoTcc9GgYa5vhvGnq8r6JQrAEtoNU7B70M0/d4mBmo3eIx8SrUbytEzx5Rc5lzD\n\tB9IIgZg+bzaXCAH3zwiK3myHCgxmMUHYpwM+gTGIeD6iwDAckoCJ8vQBW4Ywy/fo+t6n\n\t0BLQ==", "X-Gm-Message-State": "AHPjjUiwqMqC4ajzejLMBH/DSpimmAWyvsu/ZaEJjcb46YjnBiVHE55a\n\takDa8Q3HKqmClIHNR3J0+M8wqA==", "X-Google-Smtp-Source": "AOwi7QBJgmhuhN1d8VGYRjmrUZ1YruSUlaFSqGCaO+RnIh81DX5QMhiGowgCZMO2HlG/PmQ8IettrQ==", "X-Received": "by 10.84.238.130 with SMTP id v2mr3335868plk.175.1505940781329; \n\tWed, 20 Sep 2017 13:53:01 -0700 (PDT)", "From": "Kees Cook <keescook@chromium.org>", "To": "linux-kernel@vger.kernel.org", "Cc": "Kees Cook <keescook@chromium.org>, David Windsor <dave@nullcore.net>,\n\tVlad Yasevich <vyasevich@gmail.com>, Neil Horman <nhorman@tuxdriver.com>,\n\t\"David S. Miller\" <davem@davemloft.net>,\n\tlinux-sctp@vger.kernel.org, netdev@vger.kernel.org,\n\tlinux-fsdevel@vger.kernel.org, linux-mm@kvack.org,\n\tkernel-hardening@lists.openwall.com", "Subject": "[PATCH v3 21/31] sctp: Define usercopy region in SCTP proto slab\n\tcache", "Date": "Wed, 20 Sep 2017 13:45:27 -0700", "Message-Id": "<1505940337-79069-22-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": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "From: David Windsor <dave@nullcore.net>\n\nThe SCTP socket event notification subscription information need to be\ncopied to/from userspace. In support of usercopy hardening, this patch\ndefines a region in the struct proto slab cache in which userspace copy\noperations are allowed. Additionally moves the usercopy fields to be\nadjacent for the region to cover both.\n\nexample usage trace:\n\n net/sctp/socket.c:\n sctp_getsockopt_events(...):\n ...\n copy_to_user(..., &sctp_sk(sk)->subscribe, len)\n\n sctp_setsockopt_events(...):\n ...\n copy_from_user(&sctp_sk(sk)->subscribe, ..., optlen)\n\n sctp_getsockopt_initmsg(...):\n ...\n copy_to_user(..., &sctp_sk(sk)->initmsg, 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 <dave@nullcore.net>\n[kees: split from network patch, move struct member adjacent, provide usage]\nCc: Vlad Yasevich <vyasevich@gmail.com>\nCc: Neil Horman <nhorman@tuxdriver.com>\nCc: \"David S. Miller\" <davem@davemloft.net>\nCc: linux-sctp@vger.kernel.org\nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook <keescook@chromium.org>\n---\n include/net/sctp/structs.h | 9 +++++++--\n net/sctp/socket.c | 4 ++++\n 2 files changed, 11 insertions(+), 2 deletions(-)", "diff": "diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h\nindex 0477945de1a3..f2da107983d9 100644\n--- a/include/net/sctp/structs.h\n+++ b/include/net/sctp/structs.h\n@@ -202,12 +202,17 @@ struct sctp_sock {\n \t/* Flags controlling Heartbeat, SACK delay, and Path MTU Discovery. */\n \t__u32 param_flags;\n \n-\tstruct sctp_initmsg initmsg;\n \tstruct sctp_rtoinfo rtoinfo;\n \tstruct sctp_paddrparams paddrparam;\n-\tstruct sctp_event_subscribe subscribe;\n \tstruct sctp_assocparams assocparams;\n \n+\t/*\n+\t * These two structures must be grouped together for the usercopy\n+\t * whitelist region.\n+\t */\n+\tstruct sctp_event_subscribe subscribe;\n+\tstruct sctp_initmsg initmsg;\n+\n \tint user_frag;\n \n \t__u32 autoclose;\ndiff --git a/net/sctp/socket.c b/net/sctp/socket.c\nindex d4730ada7f32..aa4f86d64545 100644\n--- a/net/sctp/socket.c\n+++ b/net/sctp/socket.c\n@@ -8246,6 +8246,10 @@ struct proto sctp_prot = {\n \t.unhash =\tsctp_unhash,\n \t.get_port =\tsctp_get_port,\n \t.obj_size = sizeof(struct sctp_sock),\n+\t.useroffset = offsetof(struct sctp_sock, subscribe),\n+\t.usersize = offsetof(struct sctp_sock, initmsg) -\n+\t\t\t\toffsetof(struct sctp_sock, subscribe) +\n+\t\t\t\tsizeof_field(struct sctp_sock, initmsg),\n \t.sysctl_mem = sysctl_sctp_mem,\n \t.sysctl_rmem = sysctl_sctp_rmem,\n \t.sysctl_wmem = sysctl_sctp_wmem,\n", "prefixes": [ "v3", "21/31" ] }