From patchwork Mon Aug 28 21:35:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9926307 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 4F29C60375 for ; Mon, 28 Aug 2017 21:40:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0665528825 for ; Mon, 28 Aug 2017 21:40:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7BF628878; Mon, 28 Aug 2017 21:40:12 +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 E920F2880F for ; Mon, 28 Aug 2017 21:40:03 +0000 (UTC) Received: (qmail 13801 invoked by uid 550); 28 Aug 2017 21:35:54 -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 13359 invoked from network); 28 Aug 2017 21:35:41 -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=ikl8if2XYp3eCC6lZdQMriiykXxXkjA/kZarOP42c3A=; b=mU7oE5NkqyDDbWSpYgMBZtIBSbcUZW+67+7BvSpeeKgyXUa2xUHfIYYZp0Fjh7qv/b NA3URAUPjLhWLVRXkNIhgSpRFRKaUwOo1QQ1lcVGWxNsPk7sEY2s+sVu/Vc9uktG+5nV ZrvAyACa9GQVRWu6drFSg10qIQta6j9ux0hjc= 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=ikl8if2XYp3eCC6lZdQMriiykXxXkjA/kZarOP42c3A=; b=im0IY1bK+xHLTskEr4VMl+4Z+/kdzN4hU7NGQ0M3p2zEYnmYeZkFKww1OEmnjBKTE0 5oWwF91CvEDrsEd51WqXsGQSIU1AlbLQENsYecOFCU8pwOuCcBgfNvIGRh2g82u+QrjT gMJoNB2qGWqMy0stZ31uGYPySvQc5qlGcTfRUoydeNB5bKhEvFZGAPulK3aXc6Gs3u4T PcLJbm/v7xvvWfYZv6Cbqq++4ehicth6c+U5KdPzl1nzhnzxr3UndznUtKfDfitKV6SW t55bzmUnpxeFLl4J6DGD5pbFEFNuBLfTz2VIiGm0ura68LeJbmdYE4TbVN3LYGcZz8B5 RSSg== X-Gm-Message-State: AHYfb5gjPk+Q69WL5D3rKxtIs0tI0HS6Ds+FGigFsKfCMd7DyHgwvybE lGEnS8cxJ9jF39CB X-Received: by 10.98.84.194 with SMTP id i185mr1844362pfb.103.1503956129547; Mon, 28 Aug 2017 14:35:29 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Dmitry Tarnyagin , "David S. Miller" , netdev@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com 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> Subject: [kernel-hardening] [PATCH v2 20/30] caif: Define usercopy region in caif proto slab cache X-Virus-Scanned: ClamAV using ClamSMTP From: David Windsor The CAIF channel connection request parameters 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/caif/caif_socket.c: setsockopt(...): ... copy_from_user(&cf_sk->conn_req.param.data, ..., ol) 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: Dmitry Tarnyagin Cc: "David S. Miller" Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook --- net/caif/caif_socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 632d5a416d97..c76d513b9a7a 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -1032,6 +1032,8 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, static struct proto prot = {.name = "PF_CAIF", .owner = THIS_MODULE, .obj_size = sizeof(struct caifsock), + .useroffset = offsetof(struct caifsock, conn_req.param), + .usersize = sizeof_field(struct caifsock, conn_req.param) }; if (!capable(CAP_SYS_ADMIN) && !capable(CAP_NET_ADMIN))